Google Git
Sign in
googlers / jrn / git / fb4cc6a9cb9b701fb2f7d30b20d0c3c4ceea5882 / rerere.c
  1. ec34a8b Merge branch 'jc/rerere-multi' by Junio C Hamano · 9 years ago
  2. d9d501b rerere: remove an null statement by Junio C Hamano · 9 years ago
  3. 40cfc95 Merge branch 'nd/error-errno' by Junio C Hamano · 9 years ago
  4. 8f44961 rerere: plug memory leaks upon "rerere forget" failure by Junio C Hamano · 9 years ago
  5. 033e011 rerere.c: use error_errno() and warning_errno() by Nguyễn Thái Ngọc Duy · 9 years ago
  6. 5b715ec Merge branch 'jc/rerere-multi' by Junio C Hamano · 9 years ago
  7. 890fca8 rerere: adjust 'forget' to multi-variant world order by Junio C Hamano · 9 years ago
  8. 0ce02b3 rerere: split code to call ll_merge() further by Junio C Hamano · 9 years ago
  9. 3d730ed rerere: move code related to "forget" together by Junio C Hamano · 9 years ago
  10. 1be1e85 rerere: gc and clear by Junio C Hamano · 9 years ago
  11. 629716d rerere: do use multiple variants by Junio C Hamano · 10 years ago
  12. a13d137 rerere: allow multiple variants to exist by Junio C Hamano · 10 years ago
  13. c0a5423 rerere: delay the recording of preimage by Junio C Hamano · 10 years ago
  14. 05dd9f1 rerere: handle leftover rr-cache/$ID directory and postimage files by Junio C Hamano · 10 years ago
  15. b1a90b6 Merge branch 'jk/rerere-xsnprintf' by Junio C Hamano · 9 years ago
  16. 2c7929b rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id by Junio C Hamano · 10 years ago
  17. 1869bbe rerere: split conflict ID further by Junio C Hamano · 10 years ago
  18. f58316d rerere: replace strcpy with xsnprintf by Jeff King · 9 years ago
  19. dc5400e Merge branch 'jc/rerere' by Junio C Hamano · 9 years ago
  20. 9dd330e rerere: release lockfile in non-writing functions by Jeff King · 10 years ago
  21. f932729 memoize common git-path "constant" files by Jeff King · 10 years ago
  22. 15ed07d rerere: un-nest merge() further by Junio C Hamano · 10 years ago
  23. 1d51ece rerere: use "struct rerere_id" instead of "char *" for conflict ID by Junio C Hamano · 10 years ago
  24. 18bb993 rerere: call conflict-ids IDs by Junio C Hamano · 10 years ago
  25. 925d73c rerere: further clarify do_rerere_one_path() by Junio C Hamano · 10 years ago
  26. c7a25d3 rerere: further de-dent do_plain_rerere() by Junio C Hamano · 10 years ago
  27. 8e7768b rerere: refactor "replay" part of do_plain_rerere() by Junio C Hamano · 10 years ago
  28. e828de8 rerere: explain the remainder by Junio C Hamano · 10 years ago
  29. 963ec00 rerere: explain "rerere forget" codepath by Junio C Hamano · 10 years ago
  30. cc899ec rerere: explain the primary codepath by Junio C Hamano · 10 years ago
  31. 4b68c2a rerere: explain MERGE_RR management helpers by Junio C Hamano · 10 years ago
  32. d3c2749 rerere: fix benign off-by-one non-bug and clarify code by Junio C Hamano · 10 years ago
  33. a96847c rerere: explain the rerere I/O abstraction by Junio C Hamano · 10 years ago
  34. 7d4053b rerere: do not leak mmfile[] for a path with multiple stage #1 entries by Junio C Hamano · 10 years ago
  35. 74444d4 rerere: stop looping unnecessarily by Junio C Hamano · 10 years ago
  36. 67711cd rerere: drop want_sp parameter from is_cmarker() by Junio C Hamano · 10 years ago
  37. a14c7ab rerere: report autoupdated paths only after actually updating them by Junio C Hamano · 10 years ago
  38. e2cb6a9 rerere: write out each record of MERGE_RR in one go by Junio C Hamano · 10 years ago
  39. f5800f6 rerere: lift PATH_MAX limitation by Junio C Hamano · 10 years ago
  40. 8d9b5a4 rerere: plug conflict ID leaks by Junio C Hamano · 10 years ago
  41. 5eda906 rerere: handle conflicts with multiple stage #1 entries by Junio C Hamano · 10 years ago
  42. fb70a06 rerere: fix an off-by-one non-bug by Junio C Hamano · 10 years ago
  43. c37d7b5 Merge branch 'jk/rerere-forget-check-enabled' by Junio C Hamano · 10 years ago
  44. 0544574 rerere: exit silently on "forget" when rerere is disabled by Jeff King · 10 years ago
  45. 74419c2 Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint by Junio C Hamano · 10 years ago
  46. 76c6747 Merge branch 'jn/rerere-fail-on-auto-update-failure' by Junio C Hamano · 10 years ago
  47. 89ea903 rerere: error out on autoupdate failure by Jonathan Nieder · 10 years ago
  48. 697cc8e lockfile.h: extract new header file for the functions in lockfile.c by Michael Haggerty · 10 years ago
  49. 633e5ad rerere.c: replace `git_config()` with `git_config_get_*()` family by Tanay Abhra · 11 years ago
  50. 1fc8345 Merge branch 'rs/code-cleaning' by Junio C Hamano · 11 years ago
  51. e992d1e use strbuf_addbuf for adding strbufs by René Scharfe · 11 years ago
  52. 03b8664 read-cache: new API write_locked_index instead of write_index/write_cache by Nguyễn Thái Ngọc Duy · 11 years ago
  53. ae8d082 pathspec: pass directory indicator to match_pathspec_item() by Nguyễn Thái Ngọc Duy · 11 years ago
  54. 854b095 pathspec: rename match_pathspec_depth() to match_pathspec() by Nguyễn Thái Ngọc Duy · 11 years ago
  55. b02f5ae Merge branch 'jl/submodule-mv' by Junio C Hamano · 11 years ago
  56. 5ab0651 convert unmerge_cache to take struct pathspec by Nguyễn Thái Ngọc Duy · 12 years ago
  57. 01a10b0 rerere: convert to use parse_pathspec by Nguyễn Thái Ngọc Duy · 12 years ago
  58. 9c5e6c8 Convert "struct cache_entry *" to "const ..." wherever possible by Nguyễn Thái Ngọc Duy · 12 years ago
  59. b9e31f5 rerere forget: do not segfault if not all stages are present by Johannes Sixt · 12 years ago
  60. 53d8afa rerere forget: grok files containing NUL by Johannes Sixt · 12 years ago
  61. 7e0d4ab rerere.c: mark private file-scope symbols as static by Junio C Hamano · 12 years ago
  62. cc24a7f Merge branch 'ar/clone-honor-umask-at-top' by Junio C Hamano · 13 years ago
  63. fd95633 rerere: make rr-cache fanout directory honor umask by Junio C Hamano · 13 years ago
  64. 72a23e6 rerere: remove i18n legos in result message by Nguyễn Thái Ngọc Duy · 13 years ago
  65. fb674d7 Merge branch 'maint' by Junio C Hamano · 14 years ago
  66. 5b42477 Merge branch 'jm/maint-misc-fix' into maint by Junio C Hamano · 14 years ago
  67. a9930e3 plug a DIR buffer leak in rerere.c by Jim Meyering · 14 years ago
  68. 5743350 rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' by Jim Meyering · 14 years ago
  69. 0f891e7 rerere: libify rerere_clear() and rerere_gc() by Junio C Hamano · 14 years ago
  70. 1e4cd68 sparse: Fix errors and silence warnings by Stephen Boyd · 14 years ago
  71. ad7bb2f Merge branch 'jc/maint-rerere-in-workdir' by Junio C Hamano · 14 years ago
  72. 90a6464 rerere: make sure it works even in a workdir attached to a young repository by Junio C Hamano · 14 years ago
  73. ac49f5c rerere "remaining" by Martin von Zweigbergk · 14 years ago
  74. 75b17fe Merge branch 'jf/merge-ignore-ws' by Junio C Hamano · 14 years ago
  75. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 15 years ago
  76. e24058f Merge branch 'sg/rerere-gc-old-still-used' by Junio C Hamano · 15 years ago
  77. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
  78. ff8ba59 rerere: never renormalize by Jonathan Nieder · 15 years ago
  79. 18b037a ll-merge: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
  80. 7d7ff15 rerere: fix overeager gc by SZEDER Gábor · 15 years ago
  81. 183113a string_list: Add STRING_LIST_INIT macro and make use of it. by Thiago Farina · 15 years ago
  82. a53deac Merge branch 'jp/string-list-api-cleanup' by Junio C Hamano · 15 years ago
  83. 78a395d string_list: Fix argument order for string_list_insert by Julian Phillips · 15 years ago
  84. 4b05548 enums: omit trailing comma for portability by Gary V. Vaughan · 15 years ago
  85. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 15 years ago
  86. 689b8c2 rerere: fix memory leak if rerere images can't be read by Bert Wesarg · 15 years ago
  87. af86deb rerere: fix too-short initialization by Jeff King · 15 years ago
  88. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  89. 6751e04 Merge branch 'jc/cache-unmerge' by Junio C Hamano · 15 years ago
  90. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 15 years ago
  91. 191f2417 rerere: prepare for customizable conflict marker length by Junio C Hamano · 15 years ago
  92. 88533f6 rerere: use ll_merge() instead of using xdl_merge() by Junio C Hamano · 15 years ago
  93. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  94. dea4562 rerere forget path: forget recorded resolution by Junio C Hamano · 15 years ago
  95. 27d6b08 rerere: refactor rerere logic to make it independent from I/O by Junio C Hamano · 15 years ago
  96. d58ee6d rerere: remove silly 1024-byte line limit by Junio C Hamano · 15 years ago
  97. cb6020b Teach --[no-]rerere-autoupdate option to merge, revert and friends by Junio C Hamano · 15 years ago
  98. 2b7ca83 use write_str_in_full helper to avoid literal string lengths by Jim Meyering · 15 years ago
  99. 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 16 years ago
  100. 9005696 rerere: remove duplicated functions by SZEDER Gábor · 16 years ago