1. eea0e59 treewide: remove unnecessary includes in source files by Elijah Newren · 1 year, 1 month ago
  2. bc5c5ec cache.h: remove this no-longer-used header by Elijah Newren · 1 year, 8 months ago
  3. ccd12a3 Merge branch 'en/header-split-cache-h-part-2' by Junio C Hamano · 1 year, 8 months ago
  4. 0807e57 Merge branch 'en/header-split-cache-h' by Junio C Hamano · 1 year, 9 months ago
  5. d1cbe1e hash-ll.h: split out of hash.h to remove dependency on repository.h by Elijah Newren · 1 year, 9 months ago
  6. dabab1d object-name.h: move declarations for object-name.c functions from cache.h by Elijah Newren · 1 year, 9 months ago
  7. 6c6ddf9 treewide: be explicit about dependence on advice.h by Elijah Newren · 1 year, 9 months ago
  8. 6047b28 Merge branch 'en/header-split-cleanup' by Junio C Hamano · 1 year, 10 months ago
  9. 72871b19 Merge branch 'ab/remove-implicit-use-of-the-repository' by Junio C Hamano · 1 year, 10 months ago
  10. e7dca80 Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h by Junio C Hamano · 1 year, 10 months ago
  11. 5247b76 builtins: mark unused prefix parameters by Jeff King · 1 year, 10 months ago
  12. d850b7a cocci: apply the "cache.h" part of "the_repository.pending" by Ævar Arnfjörð Bjarmason · 1 year, 10 months ago
  13. f394e09 treewide: be explicit about dependence on gettext.h by Elijah Newren · 1 year, 10 months ago
  14. 6f69325 gettext API users: don't explicitly cast ngettext()'s "n" by Ævar Arnfjörð Bjarmason · 2 years, 11 months ago
  15. 9822175 Ensure index matches head before invoking merge machinery, round N by Elijah Newren · 5 years ago
  16. 7589e63 Merge branch 'nd/the-index-final' by Junio C Hamano · 6 years ago
  17. 0d6caa2 merge-recursive.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  18. d64bb06 merge-recursive: copy $GITHEAD strings by Jeff King · 6 years ago
  19. b7f20f7 builtin/merge-recursive: make hash independent by brian m. carlson · 7 years ago
  20. 765773c i18n: merge-recursive: mark verbose message for translation by Vasco Almeida · 8 years ago
  21. ccf7813 i18n: merge-recursive: mark error messages for translation by Vasco Almeida · 8 years ago
  22. 4e8161a merge-recursive: convert merge_recursive_generic() to object_id by brian m. carlson · 9 years ago
  23. 5096d49 convert trivial sprintf / strcpy calls to xsnprintf by Jeff King · 9 years ago
  24. 5955654 replace {pre,suf}fixcmp() with {starts,ends}_with() by Christian Couder · 11 years ago
  25. c2e86ad Fix sparse warnings by Stephen Boyd · 14 years ago
  26. 75b17fe Merge branch 'jf/merge-ignore-ws' by Junio C Hamano · 14 years ago
  27. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 14 years ago
  28. e78d01b builtin/merge_recursive.c: Add an usage string and make use of it. by Thiago Farina · 14 years ago
  29. 58a1ece merge-recursive --patience by Justin Frankel · 14 years ago
  30. 635a7bb merge-recursive: expose merge options for builtin merge by Jonathan Nieder · 14 years ago
  31. 7610fa5 merge-recursive --renormalize by Jonathan Nieder · 14 years ago
  32. 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory by Linus Torvalds · 15 years ago[Renamed from builtin-merge-recursive.c]
  33. 85e51b7 Make "subtree" part more orthogonal to the rest of merge-recursive. by Junio C Hamano · 17 years ago
  34. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago
  35. 0874f46 merge-{recursive,subtree}: use usagef() to print usage by Jonathan Nieder · 15 years ago
  36. b74d779 MinGW: Fix compiler warning in merge-recursive by Johannes Schindelin · 16 years ago
  37. d753070 remove trailing LF in die() messages by Alexander Potashev · 16 years ago
  38. 8a2fce1 merge-recursive: introduce merge_options by Miklos Vajna · 16 years ago
  39. 73118f8 merge-recursive.c: Add more generic merge_recursive_generic() by Stephan Beyer · 16 years ago
  40. 9047ebb Split out merge_recursive() to merge-recursive.c by Miklos Vajna · 16 years ago
  41. a19a424 Revert "Convert output messages in merge-recursive to past tense." by Jonathan del Strother · 16 years ago
  42. c455c87 Rename path_list to string_list by Johannes Schindelin · 17 years ago
  43. e75bf76 Merge branch 'rs/archive' by Junio C Hamano · 17 years ago
  44. 671f070 add context pointer to read_tree_recursive() by René Scharfe · 17 years ago
  45. 6531947 Move commit_list_count() to commit.c by Miklos Vajna · 17 years ago
  46. 8e21d63 clone: create intermediate directories of destination repo by Jeff King · 17 years ago
  47. ea81e10 Merge branch 'js/merge-recursive' by Junio C Hamano · 17 years ago
  48. 249c61a merge-recursive: respect core.autocrlf when writing out the result by Johannes Schindelin · 17 years ago
  49. 9bd81e4 Merge branch 'js/config-cb' by Junio C Hamano · 17 years ago v1.5.6-rc0
  50. ef90d6d Provide git_config with a callback-data parameter by Johannes Schindelin · 17 years ago
  51. b8960bb diff: make "too many files" rename warning optional by Jeff King · 17 years ago
  52. 5070591 bump rename limit defaults by Jeff King · 17 years ago
  53. 2a2ac92 add merge.renamelimit config option by Jeff King · 17 years ago
  54. 16007f3 Merge branch 'maint' by Junio C Hamano · 17 years ago
  55. b85997d Merge branch 'lt/unpack-trees' by Junio C Hamano · 17 years ago
  56. 5d921e2 Merge branch 'jc/cherry-pick' (early part) by Junio C Hamano · 17 years ago
  57. 34110cd Make 'unpack_trees()' have a separate source and destination index by Linus Torvalds · 17 years ago
  58. bc052d7 Make 'unpack_trees()' take the index to work on as an argument by Linus Torvalds · 17 years ago
  59. 5a4d707 Merge branch 'db/checkout' by Junio C Hamano · 17 years ago
  60. 94a5728 Library function to check for unmerged index entries by Daniel Barkalow · 17 years ago
  61. e1b3a2c Build-in merge-recursive by Daniel Barkalow · 17 years ago[Renamed (98%) from merge-recursive.c]
  62. 7a51ed6 Make on-disk index representation separate from in-core one by Linus Torvalds · 17 years ago
  63. 4ed7cd3 Improve use of lockfile API by Brandon Casey · 17 years ago
  64. 790296f Fix grammar nits in documentation and in code comments. by Jim Meyering · 17 years ago
  65. 20b178d Improved submodule merge support by Finn Arne Gangstad · 17 years ago
  66. ff72af0 Support a merge with conflicting gitlink change by Junio C Hamano · 17 years ago
  67. 8f67f8a Make the diff_options bitfields be an unsigned with explicit masks. by Pierre Habouzit · 17 years ago
  68. e2b7eaf Merge branch 'maint' by Junio C Hamano · 17 years ago
  69. f120ae2 merge-recursive.c: mrtree in merge() is not used before set by Junio C Hamano · 17 years ago
  70. 66d4035 Merge branch 'ph/strbuf' by Junio C Hamano · 17 years ago
  71. 102c233 Move make_cache_entry() from merge-recursive.c into read-cache.c by Carlos Rica · 17 years ago
  72. df3a02f Make merge-recursive honor diff.renamelimit by Lars Hjemli · 17 years ago
  73. 19247e5 nfv?asprintf are broken without va_copy, workaround them. by Pierre Habouzit · 17 years ago
  74. 182af83 Use xmemdupz() in many places. by Pierre Habouzit · 17 years ago
  75. 6640f88 Move make_cache_entry() from merge-recursive.c into read-cache.c by Carlos Rica · 17 years ago
  76. 7647b17 Use xmkstemp() instead of mkstemp() by Luiz Fernando N. Capitulino · 17 years ago
  77. b798671 merge-recursive: do not rudely die on binary merge by Junio C Hamano · 17 years ago
  78. 933bf40 Start moving unpack-trees to "struct tree_desc" by Linus Torvalds · 17 years ago
  79. b79d18c -Wold-style-definition fix by Junio C Hamano · 18 years ago
  80. 9f30855 merge-recursive: refuse to merge binary files by Johannes Schindelin · 18 years ago
  81. 0d5e6c9 Ignore merged status of the file-level merge by Alex Riesen · 18 years ago
  82. 8a35981 Add a test for merging changed and rename-changed branches by Alex Riesen · 18 years ago
  83. c135ee8 Avoid excessive rewrites in merge-recursive by Alex Riesen · 18 years ago
  84. a2d7c6c Merge branch 'jc/attr' by Junio C Hamano · 18 years ago
  85. e87b1c9 Fix bogus linked-list management for user defined merge drivers. by Junio C Hamano · 18 years ago
  86. ad57cbc Kill the useless progress meter in merge-recursive by Shawn O. Pearce · 18 years ago
  87. 851c603 Fix working directory errno handling when unlinking a directory by Linus Torvalds · 18 years ago
  88. d56dbd6 Simplify code to find recursive merge driver. by Junio C Hamano · 18 years ago
  89. 15ba3af Counto-fix in merge-recursive by Junio C Hamano · 18 years ago
  90. a5e92ab Fix funny types used in attribute value representation by Junio C Hamano · 18 years ago
  91. 3086486 Allow low-level driver to specify different behaviour during internal merge. by Junio C Hamano · 18 years ago
  92. 153920d Custom low-level merge driver: change the configuration scheme. by Junio C Hamano · 18 years ago
  93. be89cb2 Allow the default low-level merge driver to be configured. by Junio C Hamano · 18 years ago
  94. f3ef6b6 Custom low-level merge driver support. by Junio C Hamano · 18 years ago
  95. a129d96 Allow specifying specialized merge-backend per path. by Junio C Hamano · 18 years ago
  96. 3e5261a merge-recursive: separate out xdl_merge() interface. by Junio C Hamano · 18 years ago
  97. 4d50895 merge-recursive: handle D/F conflict case more carefully. by Junio C Hamano · 18 years ago
  98. ac7f0f4 merge-recursive: do not barf on "to be removed" entries. by Junio C Hamano · 18 years ago
  99. 68faf68 A new merge stragety 'subtree'. by Junio C Hamano · 18 years ago
  100. ee9693e Merge branch 'jc/index-output' by Junio C Hamano · 18 years ago