aboutsummaryrefslogtreecommitdiffstats
path: root/merge-recursive.h
AgeCommit message (Expand)AuthorFilesLines
2024-03-14merge options: add a conflict style memberPhillip Wood1-0/+1
2023-10-11merge: introduce {copy|clear}_merge_options()Junio C Hamano1-0/+3
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren1-0/+2
2020-08-02merge-recursive: fix unclear and outright wrong commentsElijah Newren1-7/+6
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren1-3/+3
2019-08-19merge-recursive: split internal fields into a separate structElijah Newren1-10/+7
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren1-1/+2
2019-08-19merge-recursive: comment and reorder the merge_options fieldsElijah Newren1-14/+26
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren1-4/+2
2019-08-19merge-recursive: move some definitions around to clean up the headerElijah Newren1-45/+42
2019-08-19merge-recursive: rename merge_options argument to opt in headerElijah Newren1-8/+8
2019-08-19merge-recursive: use common name for ancestors/common/base_listElijah Newren1-7/+7
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren1-1/+0
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren1-4/+16
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee1-1/+5
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+5
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano1-0/+1
2018-08-30merge-recursive: add ability to turn off directory rename detectionElijah Newren1-0/+1
2018-08-15Add missing includes and forward declarationsElijah Newren1-1/+3
2018-05-08merge: add merge.renames config settingBen Peart1-1/+8
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren1-0/+1
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren1-0/+2
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren1-0/+7
2018-05-08merge-recursive: add get_directory_renames()Elijah Newren1-0/+18
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano1-27/+0
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren1-0/+2
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren1-0/+7
2018-02-14merge-recursive: add get_directory_renames()Elijah Newren1-0/+18
2017-09-08merge-recursive: change current file dir string_lists to hashmapKevin Willford1-2/+1
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Johannes Schindelin1-1/+1
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson1-3/+3
2016-02-17merge-recursive: option to disable renamesFelipe Gonçalves Assis1-0/+1
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy1-5/+0
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themElijah Newren1-0/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano1-0/+2
2011-02-21merge: enable progress reporting for rename detectionJeff King1-0/+1
2011-02-21merge: improve inexact rename limit warningJeff King1-0/+1
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder1-1/+3
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano1-0/+1
2010-10-26Merge branch 'jf/merge-ignore-ws'Junio C Hamano1-0/+3
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard1-0/+1
2010-09-03Merge branch 'dg/local-mod-error-messages'Junio C Hamano1-6/+0
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano1-0/+1
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itMatthieu Moy1-6/+0
2010-08-26merge-recursive --patienceJustin Frankel1-0/+1
2010-08-26merge-recursive: expose merge options for builtin mergeJonathan Nieder1-0/+2
2010-08-11merge-recursive: porcelain messages for checkoutDiane Gasselin1-2/+5
2010-08-11Turn unpack_trees_options.msgs into an array + enumMatthieu Moy1-2/+2
2010-08-06merge-trees: let caller decide whether to renormalizeJonathan Nieder1-0/+1
2010-06-21Merge branch 'gv/portable'Junio C Hamano1-1/+1
2010-05-31enums: omit trailing comma for portabilityGary V. Vaughan1-1/+1
2010-04-01merge: make function try_merge_command non staticChristian Couder1-0/+3
2010-03-20merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder1-0/+1
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-1/+6
2010-01-17Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano1-1/+2
2010-01-17git merge -X<option>Avery Pennarun1-1/+5
2009-11-29merge-recursive: make the error-message generation an extern functionMatthieu Moy1-0/+3
2008-09-04merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna1-0/+4
2008-09-04merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna1-0/+1
2008-09-03merge-recursive: move call_depth to struct merge_optionsMiklos Vajna1-0/+1
2008-08-30merge-recursive: introduce merge_optionsMiklos Vajna1-13/+29
2008-08-30merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer1-1/+3
2008-08-30Split out merge_recursive() to merge-recursive.cMiklos Vajna1-1/+5
2008-02-09Build-in merge-recursiveDaniel Barkalow1-0/+20
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-04-29 09:31:56 +0000