30 Commits (0b35deb378ee471f64e1b376d722e0bdd97d5e36)

Author SHA1 Message Date
Jeff King 99bfc6691d merge: enable progress reporting for rename detection 14 years ago
Jeff King bf0ab10fa8 merge: improve inexact rename limit warning 14 years ago
Jonathan Nieder 67ac1e1d57 cherry-pick/revert: add support for -X/--strategy-option 14 years ago
Kevin Ballard 10ae7526be merge-recursive: option to specify rename threshold 14 years ago
Matthieu Moy dc1166e685 Move set_porcelain_error_msgs to unpack-trees.c and rename it 15 years ago
Justin Frankel 58a1ece478 merge-recursive --patience 15 years ago
Jonathan Nieder 635a7bb1d8 merge-recursive: expose merge options for builtin merge 15 years ago
Diane Gasselin 23cbf11b5c merge-recursive: porcelain messages for checkout 15 years ago
Matthieu Moy 08353ebbab Turn unpack_trees_options.msgs into an array + enum 15 years ago
Jonathan Nieder 1bc0ab7cd1 merge-trees: let caller decide whether to renormalize 15 years ago
Gary V. Vaughan 4b05548fc0 enums: omit trailing comma for portability 15 years ago
Christian Couder c674d05273 merge: make function try_merge_command non static 15 years ago
Jonathan Nieder 4c5868f43d merge_trees(): add ancestor label parameter for diff3-style output 15 years ago
Junio C Hamano 85e51b783c Make "subtree" part more orthogonal to the rest of merge-recursive. 15 years ago
Avery Pennarun 8cc5b29065 git merge -X<option> 15 years ago
Matthieu Moy 264b774ba6 merge-recursive: make the error-message generation an extern function 15 years ago
Miklos Vajna 696ee23cc1 merge-recursive: move current_{file,directory}_set to struct merge_options 17 years ago
Miklos Vajna c7d849243a merge-recursive: move the global obuf to struct merge_options 17 years ago
Miklos Vajna 5033639c95 merge-recursive: move call_depth to struct merge_options 17 years ago
Miklos Vajna 8a2fce1895 merge-recursive: introduce merge_options 17 years ago
Stephan Beyer 73118f89b8 merge-recursive.c: Add more generic merge_recursive_generic() 17 years ago
Miklos Vajna 9047ebbc22 Split out merge_recursive() to merge-recursive.c 17 years ago
Daniel Barkalow e1b3a2cad7 Build-in merge-recursive 17 years ago