aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.h
Commit message (Expand)AuthorAge
* Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-03
|\
| * Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-03
* | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\ \ | |/ |/|
| * merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-06
* | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-11
* | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-11
|/
* Merge branch 'gv/portable'Junio C Hamano2010-06-21
|\
| * enums: omit trailing comma for portabilityGary V. Vaughan2010-05-31
* | merge: make function try_merge_command non staticChristian Couder2010-04-01
|/
* merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-20
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\
| * Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-17
| * git merge -X<option>Avery Pennarun2010-01-17
* | merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-29
|/
* merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-04
* merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-04
* merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-03
* merge-recursive: introduce merge_optionsMiklos Vajna2008-08-30
* merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-30
* Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-30
* Build-in merge-recursiveDaniel Barkalow2008-02-09