summaryrefslogtreecommitdiff
path: root/merge-recursive.h
AgeCommit message (Expand)Author
2010-03-21merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-18Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano
2010-01-18git merge -X<option>Avery Pennarun
2009-11-30merge-recursive: make the error-message generation an extern functionMatthieu Moy
2008-09-05merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna
2008-09-05merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna
2008-09-04merge-recursive: move call_depth to struct merge_optionsMiklos Vajna
2008-08-31merge-recursive: introduce merge_optionsMiklos Vajna
2008-08-31merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer
2008-08-31Split out merge_recursive() to merge-recursive.cMiklos Vajna
2008-02-10Build-in merge-recursiveDaniel Barkalow