summaryrefslogtreecommitdiff
path: root/merge-recursive.h
AgeCommit message (Expand)AuthorFilesLines
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Libravatar Junio C Hamano1-1/+2
2010-01-17git merge -X<option>Libravatar Avery Pennarun1-1/+5
2009-11-29merge-recursive: make the error-message generation an extern functionLibravatar Matthieu Moy1-0/+3
2008-09-04merge-recursive: move current_{file,directory}_set to struct merge_optionsLibravatar Miklos Vajna1-0/+4
2008-09-04merge-recursive: move the global obuf to struct merge_optionsLibravatar Miklos Vajna1-0/+1
2008-09-03merge-recursive: move call_depth to struct merge_optionsLibravatar Miklos Vajna1-0/+1
2008-08-30merge-recursive: introduce merge_optionsLibravatar Miklos Vajna1-13/+29
2008-08-30merge-recursive.c: Add more generic merge_recursive_generic()Libravatar Stephan Beyer1-1/+3
2008-08-30Split out merge_recursive() to merge-recursive.cLibravatar Miklos Vajna1-1/+5
2008-02-09Build-in merge-recursiveLibravatar Daniel Barkalow1-0/+20