1. 6054d1a merge-ort: format messages slightly different for use in headers by Elijah Newren · 3 years ago
  2. 56e7434 merge-recursive: fix unclear and outright wrong comments by Elijah Newren · 4 years, 5 months ago
  3. f3081da merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* by Elijah Newren · 5 years ago
  4. 5bf7e57 merge-recursive: split internal fields into a separate struct by Elijah Newren · 5 years ago
  5. e95e481 merge-recursive: avoid losing output and leaking memory holding that output by Elijah Newren · 5 years ago
  6. a779fb8 merge-recursive: comment and reorder the merge_options fields by Elijah Newren · 5 years ago
  7. 8599ab4 merge-recursive: consolidate unnecessary fields in merge_options by Elijah Newren · 5 years ago
  8. 7c0a6c8 merge-recursive: move some definitions around to clean up the header by Elijah Newren · 5 years ago
  9. c749ab1 merge-recursive: rename merge_options argument to opt in header by Elijah Newren · 5 years ago
  10. ff1bfa2 merge-recursive: use common name for ancestors/common/base_list by Elijah Newren · 5 years ago
  11. 724dd76 cache-tree: share code between functions writing an index as a tree by Elijah Newren · 5 years ago
  12. b4db8a2 merge-recursive: remove useless parameter in merge_trees() by Elijah Newren · 5 years ago
  13. 8e01251 merge-recursive: introduce an enum for detect_directory_renames values by Derrick Stolee · 5 years ago
  14. 0d6caa2 merge-recursive.c: remove implicit dependency on the_index by Nguyễn Thái Ngọc Duy · 6 years ago
  15. ca676b9 Merge branch 'en/directory-renames-nothanks' by Junio C Hamano · 6 years ago
  16. 5fdddd9 merge-recursive: add ability to turn off directory rename detection by Elijah Newren · 6 years ago
  17. ef3ca95 Add missing includes and forward declarations by Elijah Newren · 6 years ago
  18. 85b4603 merge: add merge.renames config setting by Ben Peart · 7 years ago
  19. a35edc8 merge-recursive: fix was_tracked() to quit lying with some renamed paths by Elijah Newren · 7 years ago
  20. 64b1abe merge-recursive: fix overwriting dirty files involved in renames by Elijah Newren · 7 years ago
  21. e95ab70 merge-recursive: add computation of collisions due to dir rename & merging by Elijah Newren · 7 years ago
  22. 7fe40b8 merge-recursive: add get_directory_renames() by Elijah Newren · 7 years ago
  23. 8b026ed Revert "Merge branch 'en/rename-directory-detection'" by Junio C Hamano · 7 years ago
  24. e0052f4 merge-recursive: fix overwriting dirty files involved in renames by Elijah Newren · 7 years ago
  25. ea625cb merge-recursive: add computation of collisions due to dir rename & merging by Elijah Newren · 7 years ago
  26. 8383408 merge-recursive: add get_directory_renames() by Elijah Newren · 7 years ago
  27. fc65b00 merge-recursive: change current file dir string_lists to hashmap by Kevin Willford · 7 years ago
  28. f1e2426 merge-recursive: offer an option to retain the output in 'obuf' by Johannes Schindelin · 8 years ago
  29. 4e8161a merge-recursive: convert merge_recursive_generic() to object_id by brian m. carlson · 9 years ago
  30. d2b11ec merge-recursive: option to disable renames by Felipe Gonçalves Assis · 9 years ago
  31. db699a8 Move try_merge_command and checkout_fast_forward to libgit.a by Nguyễn Thái Ngọc Duy · 12 years ago
  32. 70cc3d3 merge-recursive: Save D/F conflict filenames instead of unlinking them by Elijah Newren · 13 years ago
  33. 0ce6a51 Merge branch 'jk/merge-rename-ux' by Junio C Hamano · 14 years ago
  34. 99bfc66 merge: enable progress reporting for rename detection by Jeff King · 14 years ago
  35. bf0ab10 merge: improve inexact rename limit warning by Jeff King · 14 years ago
  36. 67ac1e1 cherry-pick/revert: add support for -X/--strategy-option by Jonathan Nieder · 14 years ago
  37. 329351f Merge branch 'kb/merge-recursive-rename-threshold' by Junio C Hamano · 14 years ago
  38. 75b17fe Merge branch 'jf/merge-ignore-ws' by Junio C Hamano · 14 years ago
  39. 10ae752 merge-recursive: option to specify rename threshold by Kevin Ballard · 14 years ago
  40. c208e05 Merge branch 'dg/local-mod-error-messages' by Junio C Hamano · 14 years ago
  41. 8aed4a5 Merge branch 'jn/merge-renormalize' by Junio C Hamano · 14 years ago
  42. dc1166e Move set_porcelain_error_msgs to unpack-trees.c and rename it by Matthieu Moy · 14 years ago
  43. 58a1ece merge-recursive --patience by Justin Frankel · 14 years ago
  44. 635a7bb merge-recursive: expose merge options for builtin merge by Jonathan Nieder · 14 years ago
  45. 23cbf11 merge-recursive: porcelain messages for checkout by Diane Gasselin · 14 years ago
  46. 08353eb Turn unpack_trees_options.msgs into an array + enum by Matthieu Moy · 14 years ago
  47. 1bc0ab7 merge-trees: let caller decide whether to renormalize by Jonathan Nieder · 14 years ago
  48. 8d676d8 Merge branch 'gv/portable' by Junio C Hamano · 15 years ago
  49. 4b05548 enums: omit trailing comma for portability by Gary V. Vaughan · 15 years ago
  50. c674d05 merge: make function try_merge_command non static by Christian Couder · 15 years ago
  51. 4c5868f merge_trees(): add ancestor label parameter for diff3-style output by Jonathan Nieder · 15 years ago
  52. fcb2a7e Merge branch 'ap/merge-backend-opts' by Junio C Hamano · 15 years ago
  53. 85e51b7 Make "subtree" part more orthogonal to the rest of merge-recursive. by Junio C Hamano · 17 years ago
  54. 8cc5b29 git merge -X<option> by Avery Pennarun · 15 years ago
  55. 264b774 merge-recursive: make the error-message generation an extern function by Matthieu Moy · 15 years ago
  56. 696ee23 merge-recursive: move current_{file,directory}_set to struct merge_options by Miklos Vajna · 16 years ago
  57. c7d8492 merge-recursive: move the global obuf to struct merge_options by Miklos Vajna · 16 years ago
  58. 5033639 merge-recursive: move call_depth to struct merge_options by Miklos Vajna · 16 years ago
  59. 8a2fce1 merge-recursive: introduce merge_options by Miklos Vajna · 16 years ago
  60. 73118f8 merge-recursive.c: Add more generic merge_recursive_generic() by Stephan Beyer · 16 years ago
  61. 9047ebb Split out merge_recursive() to merge-recursive.c by Miklos Vajna · 16 years ago
  62. e1b3a2c Build-in merge-recursive by Daniel Barkalow · 17 years ago