Google Git
Sign in
googlers / jrn / git / 02976bf856bc47ea2bcb9423cd13b6f69ce58929 / rerere.c
  1. c37d7b5 Merge branch 'jk/rerere-forget-check-enabled' by Junio C Hamano · 10 years ago
  2. 0544574 rerere: exit silently on "forget" when rerere is disabled by Jeff King · 10 years ago
  3. 76c6747 Merge branch 'jn/rerere-fail-on-auto-update-failure' by Junio C Hamano · 10 years ago
  4. 89ea903 rerere: error out on autoupdate failure by Jonathan Nieder · 10 years ago
  5. 697cc8e lockfile.h: extract new header file for the functions in lockfile.c by Michael Haggerty · 10 years ago
  6. 633e5ad rerere.c: replace `git_config()` with `git_config_get_*()` family by Tanay Abhra · 11 years ago
  7. 1fc8345 Merge branch 'rs/code-cleaning' by Junio C Hamano · 11 years ago
  8. e992d1e use strbuf_addbuf for adding strbufs by René Scharfe · 11 years ago
  9. 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
  10. ae8d082 pathspec: pass directory indicator to match_pathspec_item() by Nguyễn Thái Ngọc Duy · 11 years ago
  11. 854b095 pathspec: rename match_pathspec_depth() to match_pathspec() by Nguyễn Thái Ngọc Duy · 11 years ago
  12. b02f5ae Merge branch 'jl/submodule-mv' by Junio C Hamano · 12 years ago
  13. 5ab0651 convert unmerge_cache to take struct pathspec by Nguyễn Thái Ngọc Duy · 12 years ago
  14. 01a10b0 rerere: convert to use parse_pathspec by Nguyễn Thái Ngọc Duy · 12 years ago
  15. 9c5e6c8 Convert "struct cache_entry *" to "const ..." wherever possible by Nguyễn Thái Ngọc Duy · 12 years ago
  16. b9e31f5 rerere forget: do not segfault if not all stages are present by Johannes Sixt · 12 years ago
  17. 53d8afa rerere forget: grok files containing NUL by Johannes Sixt · 12 years ago
  18. 7e0d4ab rerere.c: mark private file-scope symbols as static by Junio C Hamano · 12 years ago
  19. cc24a7f Merge branch 'ar/clone-honor-umask-at-top' by Junio C Hamano · 13 years ago
  20. fd95633 rerere: make rr-cache fanout directory honor umask by Junio C Hamano · 13 years ago
  21. 72a23e6 rerere: remove i18n legos in result message by Nguyễn Thái Ngọc Duy · 13 years ago
  22. fb674d7 Merge branch 'maint' by Junio C Hamano · 14 years ago
  23. 5b42477 Merge branch 'jm/maint-misc-fix' into maint by Junio C Hamano · 14 years ago
  24. a9930e3 plug a DIR buffer leak in rerere.c by Jim Meyering · 14 years ago
  25. 5743350 rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' by Jim Meyering · 14 years ago
  26. 0f891e7 rerere: libify rerere_clear() and rerere_gc() by Junio C Hamano · 14 years ago
  27. 1e4cd68 sparse: Fix errors and silence warnings by Stephen Boyd · 14 years ago
  28. ad7bb2f Merge branch 'jc/maint-rerere-in-workdir' by Junio C Hamano · 14 years ago
  29. 90a6464 rerere: make sure it works even in a workdir attached to a young repository by Junio C Hamano · 14 years ago
  30. ac49f5c rerere "remaining" by Martin von Zweigbergk · 14 years ago
  31. 75b17fe Merge branch 'jf/merge-ignore-ws' by Junio C Hamano · 14 years ago
  32. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 15 years ago
  33. e24058f Merge branch 'sg/rerere-gc-old-still-used' by Junio C Hamano · 15 years ago
  34. 712516b ll-merge: replace flag argument with options struct by Jonathan Nieder · 15 years ago
  35. ff8ba59 rerere: never renormalize by Jonathan Nieder · 15 years ago
  36. 18b037a ll-merge: let caller decide whether to renormalize by Jonathan Nieder · 15 years ago
  37. 7d7ff15 rerere: fix overeager gc by SZEDER Gábor · 15 years ago
  38. 183113a string_list: Add STRING_LIST_INIT macro and make use of it. by Thiago Farina · 15 years ago
  39. a53deac Merge branch 'jp/string-list-api-cleanup' by Junio C Hamano · 15 years ago
  40. 78a395d string_list: Fix argument order for string_list_insert by Julian Phillips · 15 years ago
  41. 4b05548 enums: omit trailing comma for portability by Gary V. Vaughan · 15 years ago
  42. f01de62 ll_merge(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 15 years ago
  43. 689b8c2 rerere: fix memory leak if rerere images can't be read by Bert Wesarg · 15 years ago
  44. af86deb rerere: fix too-short initialization by Jeff King · 15 years ago
  45. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  46. 6751e04 Merge branch 'jc/cache-unmerge' by Junio C Hamano · 15 years ago
  47. 8588567 rerere: honor conflict-marker-size attribute by Junio C Hamano · 15 years ago
  48. 191f2417 rerere: prepare for customizable conflict marker length by Junio C Hamano · 15 years ago
  49. 88533f6 rerere: use ll_merge() instead of using xdl_merge() by Junio C Hamano · 15 years ago
  50. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  51. dea4562 rerere forget path: forget recorded resolution by Junio C Hamano · 15 years ago
  52. 27d6b08 rerere: refactor rerere logic to make it independent from I/O by Junio C Hamano · 15 years ago
  53. d58ee6d rerere: remove silly 1024-byte line limit by Junio C Hamano · 15 years ago
  54. cb6020b Teach --[no-]rerere-autoupdate option to merge, revert and friends by Junio C Hamano · 15 years ago
  55. 2b7ca83 use write_str_in_full helper to avoid literal string lengths by Jim Meyering · 16 years ago
  56. 691f1a2 replace direct calls to unlink(2) with unlink_or_warn by Alex Riesen · 16 years ago
  57. 9005696 rerere: remove duplicated functions by SZEDER Gábor · 16 years ago
  58. ba19a80 Drop double-semicolon in C by Junio C Hamano · 16 years ago
  59. 47d32af Make some of fwrite/fclose/write/close failures visible by Alex Riesen · 16 years ago
  60. 98b35e2 Merge branch 'ar/maint-mksnpath' into ar/mksnpath by Junio C Hamano · 16 years ago
  61. a4f34cb Use git_pathdup instead of xstrdup(git_path(...)) by Alex Riesen · 16 years ago
  62. a157400 Merge branch 'jc/maint-co-track' by Junio C Hamano · 16 years ago
  63. acd3b9e Enhance hold_lock_file_for_{update,append}() API by Junio C Hamano · 16 years ago
  64. f285a2d Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer by Brandon Casey · 16 years ago
  65. 9126f00 fix openssl headers conflicting with custom SHA1 implementations by Nicolas Pitre · 16 years ago
  66. 9ba929e Merge branch 'jc/better-conflict-resolution' by Shawn O. Pearce · 16 years ago
  67. 90b4a71 is_directory(): a generic helper function by Junio C Hamano · 17 years ago
  68. 387c9d4 rerere: understand "diff3 -m" style conflicts with the original by Junio C Hamano · 17 years ago
  69. cc58d7d rerere.c: use symbolic constants to keep track of parsing states by Junio C Hamano · 17 years ago
  70. c455c87 Rename path_list to string_list by Johannes Schindelin · 17 years ago
  71. 9196e82 rerere.autoupdate: change the message when autoupdate is in effect by Junio C Hamano · 17 years ago
  72. ebcffb1 Merge branch 'js/merge-rr' by Junio C Hamano · 17 years ago
  73. 5b2fd95 rerere: Separate libgit and builtin functions by Stephan Beyer · 17 years ago