summaryrefslogtreecommitdiff
path: root/merge-recursive.h
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy2019-01-141-1/+5
* Merge branch 'en/directory-renames-nothanks'Junio C Hamano2018-09-041-0/+1
|\
| * merge-recursive: add ability to turn off directory rename detectionElijah Newren2018-08-301-0/+1
* | Add missing includes and forward declarationsElijah Newren2018-08-151-1/+3
|/
* merge: add merge.renames config settingBen Peart2018-05-081-1/+8
* merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren2018-05-081-0/+1
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-05-081-0/+2
* merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren2018-05-081-0/+7
* merge-recursive: add get_directory_renames()Elijah Newren2018-05-081-0/+18
* Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano2018-04-111-27/+0
* merge-recursive: fix overwriting dirty files involved in renamesElijah Newren2018-02-271-0/+2
* merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren2018-02-141-0/+7
* merge-recursive: add get_directory_renames()Elijah Newren2018-02-141-0/+18
* merge-recursive: change current file dir string_lists to hashmapkw/merge-recursive-cleanupKevin Willford2017-09-081-2/+1
* merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin2016-08-011-1/+1
* merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson2016-06-281-3/+3
* merge-recursive: option to disable renamesFelipe Gonçalves Assis2016-02-171-0/+1
* Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-5/+0
* merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren2011-08-141-0/+1
* Merge branch 'jk/merge-rename-ux'Junio C Hamano2011-03-191-0/+2
|\
| * merge: enable progress reporting for rename detectionJeff King2011-02-211-0/+1
| * merge: improve inexact rename limit warningJeff King2011-02-211-0/+1
* | cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-281-1/+3
|/
* Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-261-0/+1
|\
| * merge-recursive: option to specify rename thresholdKevin Ballard2010-09-291-0/+1
* | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-0/+3
|\ \ | |/
| * merge-recursive --patienceJustin Frankel2010-08-261-0/+1
| * merge-recursive: expose merge options for builtin mergeJonathan Nieder2010-08-261-0/+2
* | Merge branch 'dg/local-mod-error-messages'Junio C Hamano2010-09-031-6/+0
|\ \
| * | Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy2010-09-031-6/+0
* | | Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-031-0/+1
|\ \ \ | |/ / |/| / | |/
| * merge-trees: let caller decide whether to renormalizeJonathan Nieder2010-08-061-0/+1
* | merge-recursive: porcelain messages for checkoutDiane Gasselin2010-08-111-2/+5
* | Turn unpack_trees_options.msgs into an array + enumMatthieu Moy2010-08-111-2/+2
|/
* Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+1
|\
| * enums: omit trailing comma for portabilityGary V. Vaughan2010-05-311-1/+1
* | merge: make function try_merge_command non staticChristian Couder2010-04-011-0/+3
|/
* merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-201-0/+1
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-1/+6
|\
| * Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-171-1/+2
| * git merge -X<option>Avery Pennarun2010-01-171-1/+5
* | merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-291-0/+3
|/
* merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-041-0/+4
* merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-041-0/+1
* merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-031-0/+1
* merge-recursive: introduce merge_optionsMiklos Vajna2008-08-301-13/+29
* merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-301-1/+3
* Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-301-1/+5
* Build-in merge-recursiveDaniel Barkalow2008-02-091-0/+20
View Lorry Controller Status