Google Git
Sign in
googlers / jrn / git / 9dd330e6cad6ce11557acb18f35136c549d8ac1b / builtin / rerere.c
  1. 9dd330e rerere: release lockfile in non-writing functions by Jeff King · 10 years ago
  2. 9c9b4f2 standardize usage info string format by Alex Henrie · 10 years ago
  3. de3d8bb rerere: fix for merge.conflictstyle by Felipe Contreras · 11 years ago
  4. 01a10b0 rerere: convert to use parse_pathspec by Nguyễn Thái Ngọc Duy · 12 years ago
  5. 0ff07f2 i18n: rerere: mark parseopt strings for translation by Nguyễn Thái Ngọc Duy · 13 years ago
  6. 0f891e7 rerere: libify rerere_clear() and rerere_gc() by Junio C Hamano · 14 years ago
  7. 5d2c3b0 rerere forget: deprecate invocation without pathspec by Johannes Sixt · 14 years ago
  8. ac49f5c rerere "remaining" by Martin von Zweigbergk · 14 years ago
  9. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 15 years ago
  10. e24058f Merge branch 'sg/rerere-gc-old-still-used' by Junio C Hamano · 15 years ago
  11. 6b5005c Merge branch 'tf/string-list-init' by Junio C Hamano · 15 years ago
  12. 672d1b7 rerere: migrate to parse-options API by Jonathan Nieder · 15 years ago
  13. 4bd874c Merge branch 'js/merge-rr-fix' by Junio C Hamano · 15 years ago
  14. 3ca399d MERGE_RR is in .git, not .git/rr-cache by Jay Soffian · 15 years ago
  15. 7d7ff15 rerere: fix overeager gc by SZEDER Gábor · 15 years ago
  16. 183113a string_list: Add STRING_LIST_INIT macro and make use of it. by Thiago Farina · 15 years ago
  17. a53deac Merge branch 'jp/string-list-api-cleanup' by Junio C Hamano · 15 years ago
  18. 1d2f80f string_list: Fix argument order for string_list_append by Julian Phillips · 15 years ago
  19. 6033553 Merge branch 'rs/diff-no-minimal' into maint by Junio C Hamano · 15 years ago
  20. 39b5977 Merge branch 'rs/diff-no-minimal' by Junio C Hamano · 15 years ago
  21. 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory by Linus Torvalds · 15 years ago[Renamed from builtin-rerere.c]
  22. 5a9f039 Make 'rerere forget' work from a subdirectory. by Johannes Sixt · 15 years ago
  23. 6751e04 Merge branch 'jc/cache-unmerge' by Junio C Hamano · 15 years ago
  24. 4a88fb7 Merge branch 'jc/rerere' by Junio C Hamano · 15 years ago
  25. dea4562 rerere forget path: forget recorded resolution by Junio C Hamano · 15 years ago
  26. 3880c18 Sync with 1.6.5.5 by Junio C Hamano · 15 years ago
  27. e5f5917 rerere: don't segfault on failure to open rr-cache by Jeff King · 15 years ago
  28. cb6020b Teach --[no-]rerere-autoupdate option to merge, revert and friends by Junio C Hamano · 15 years ago
  29. 99caeed Let 'git <command> -h' show usage without a git dir by Jonathan Nieder · 15 years ago
  30. 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 16 years ago
  31. 9005696 rerere: remove duplicated functions by SZEDER Gábor · 16 years ago
  32. 8ca12c0 add is_dot_or_dotdot inline function by Alexander Potashev · 16 years ago
  33. 9ccd0a8 Always initialize xpparam_t to 0 by Brian Downing · 16 years ago
  34. c455c87 Rename path_list to string_list by Johannes Schindelin · 17 years ago
  35. 588c038 Merge branch 'sb/dashless' by Junio C Hamano · 17 years ago
  36. 1b1dd23 Make usage strings dash-less by Stephan Beyer · 17 years ago
  37. 5b2fd95 rerere: Separate libgit and builtin functions by Stephan Beyer · 17 years ago
  38. 99d698f builtin-rerere: more carefully find conflict markers by Olivier Marin · 17 years ago
  39. 121c813 rerere.autoupdate by Junio C Hamano · 17 years ago
  40. 51e0d0a rerere: remove dubious "tail_optimization" by Junio C Hamano · 17 years ago
  41. a1b32fd git-rerere: detect unparsable conflicts by Junio C Hamano · 17 years ago
  42. 9022a49 rerere: rerere_created_at() and has_resolution() abstraction by Junio C Hamano · 17 years ago
  43. 1a8fb15 builtin-rerere: fix a small leak by Junio C Hamano · 17 years ago
  44. ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 17 years ago
  45. 2db511f Merge branch 'maint' by Junio C Hamano · 17 years ago
  46. 1468bd4 Use a single implementation and API for copy_file() by Daniel Barkalow · 17 years ago
  47. 7a51ed6 Make on-disk index representation separate from in-core one by Linus Torvalds · 17 years ago
  48. 4ed7cd3 Improve use of lockfile API by Brandon Casey · 17 years ago
  49. c279d7e xdl_diff: identify call sites. by Junio C Hamano · 17 years ago
  50. d8b7db0 Export rerere() and launch_editor(). by Kristian Høgsberg · 18 years ago
  51. b4833a2 rerere: Fix use of an empty strbuf.buf by Junio C Hamano · 17 years ago
  52. 8289b62 Make builtin-rerere use of strbuf nicer and more efficient. by Pierre Habouzit · 17 years ago
  53. ba3ed09 Now that cache.h needs strbuf.h, remove useless includes. by Pierre Habouzit · 18 years ago
  54. f1696ee Strbuf API extensions and fixes. by Pierre Habouzit · 18 years ago
  55. 19b358e Use strbuf API in buitin-rerere.c by Pierre Habouzit · 18 years ago
  56. baffc0e Make every builtin-*.c file #include "builtin.h" by Peter Hagervall · 18 years ago
  57. 52aaf64 rerere: record resolution even if file is not in merge base by Johannes Schindelin · 18 years ago
  58. e3c76db Merge branch 'jc/diff-mark' by Junio C Hamano · 18 years ago
  59. b4372ef Enable "git rerere" by the config variable rerere.enabled by Johannes Schindelin · 18 years ago
  60. 30b2501 Future-proof source for changes in xdemitconf_t by Johannes Schindelin · 18 years ago
  61. 91c8d59 detect close failure on just-written file handles by Jim Meyering · 18 years ago
  62. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  63. 2b93edb rerere: make sorting really stable. by Junio C Hamano · 18 years ago
  64. 045f575 Merge 1.5.0.7 in by Junio C Hamano · 18 years ago
  65. eb33596 rerere should not repeat the earlier hunks in later ones by Junio C Hamano · 18 years ago
  66. 2c7ca1f Merge branch 'maint' by Junio C Hamano · 18 years ago
  67. 1289172 rerere: do not deal with symlinks. by Junio C Hamano · 18 years ago
  68. ab242f8 rerere: do not skip two conflicted paths next to each other. by Junio C Hamano · 18 years ago
  69. 599065a prefixcmp(): fix-up mechanical conversion. by Junio C Hamano · 18 years ago
  70. cc44c76 Mechanical conversion to use prefixcmp() by Junio C Hamano · 18 years ago
  71. 93822c2 short i/o: fix calls to write to use xwrite or write_in_full by Andy Whitcroft · 18 years ago
  72. 3a2d3e8 rerere: Fix removal of already resolved path. by Junio C Hamano · 18 years ago
  73. 48c3242 rerere gc: honor configuration and document it by Junio C Hamano · 18 years ago
  74. 658f365 Make git-rerere a builtin by Johannes Schindelin · 18 years ago