path: root/merge-recursive.h
AgeCommit message (Expand)Author
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson
2016-02-17merge-recursive: option to disable renamesFelipe Gonçalves Assis
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren
2011-03-20Merge branch 'jk/merge-rename-ux'Junio C Hamano
2011-02-21merge: enable progress reporting for rename detectionJeff King
2011-02-21merge: improve inexact rename limit warningJeff King
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder
2010-10-27Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano
2010-10-27Merge branch 'jf/merge-ignore-ws'Junio C Hamano
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard
2010-09-04Merge branch 'dg/local-mod-error-messages'Junio C Hamano
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy
2010-08-26merge-recursive --patienceJustin Frankel
2010-08-26merge-recursive: expose merge options for builtin mergeJonathan Nieder
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy
2010-08-06merge-trees: let caller decide whether to renormalizeJonathan Nieder
2010-06-21Merge branch 'gv/portable'Junio C Hamano
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan
2010-04-01merge: make function try_merge_command non staticChristian Couder
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