summaryrefslogtreecommitdiff
path: root/merge-recursive.h
AgeCommit message (Expand)AuthorFilesLines
2020-08-02merge-recursive: fix unclear and outright wrong commentsLibravatar Elijah Newren1-7/+6
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Libravatar Elijah Newren1-3/+3
2019-08-19merge-recursive: split internal fields into a separate structLibravatar Elijah Newren1-10/+7
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputLibravatar Elijah Newren1-1/+2
2019-08-19merge-recursive: comment and reorder the merge_options fieldsLibravatar Elijah Newren1-14/+26
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsLibravatar Elijah Newren1-4/+2
2019-08-19merge-recursive: move some definitions around to clean up the headerLibravatar Elijah Newren1-45/+42
2019-08-19merge-recursive: rename merge_options argument to opt in headerLibravatar Elijah Newren1-8/+8
2019-08-19merge-recursive: use common name for ancestors/common/base_listLibravatar Elijah Newren1-7/+7
2019-08-19cache-tree: share code between functions writing an index as a treeLibravatar Elijah Newren1-1/+0
2019-08-19merge-recursive: remove useless parameter in merge_trees()Libravatar Elijah Newren1-4/+16
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesLibravatar Derrick Stolee1-1/+5
2019-01-14merge-recursive.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+5
2018-09-04Merge branch 'en/directory-renames-nothanks'Libravatar Junio C Hamano1-0/+1
2018-08-30merge-recursive: add ability to turn off directory rename detectionLibravatar Elijah Newren1-0/+1
2018-08-15Add missing includes and forward declarationsLibravatar Elijah Newren1-1/+3
2018-05-08merge: add merge.renames config settingLibravatar Ben Peart1-1/+8
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsLibravatar Elijah Newren1-0/+1
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-0/+2
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingLibravatar Elijah Newren1-0/+7
2018-05-08merge-recursive: add get_directory_renames()Libravatar Elijah Newren1-0/+18
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Libravatar Junio C Hamano1-27/+0
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesLibravatar Elijah Newren1-0/+2
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingLibravatar Elijah Newren1-0/+7
2018-02-14merge-recursive: add get_directory_renames()Libravatar Elijah Newren1-0/+18
2017-09-08merge-recursive: change current file dir string_lists to hashmapLibravatar Kevin Willford1-2/+1
2016-08-01merge-recursive: offer an option to retain the output in 'obuf'Libravatar Johannes Schindelin1-1/+1
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idLibravatar brian m. carlson1-3/+3
2016-02-17merge-recursive: option to disable renamesLibravatar Felipe Gonçalves Assis1-0/+1
2012-10-29Move try_merge_command and checkout_fast_forward to libgit.aLibravatar Nguyễn Thái Ngọc Duy1-5/+0
2011-08-14merge-recursive: Save D/F conflict filenames instead of unlinking themLibravatar Elijah Newren1-0/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Libravatar Junio C Hamano1-0/+2
2011-02-21merge: enable progress reporting for rename detectionLibravatar Jeff King1-0/+1
2011-02-21merge: improve inexact rename limit warningLibravatar Jeff King1-0/+1
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionLibravatar Jonathan Nieder1-1/+3
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Libravatar Junio C Hamano1-0/+1
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-0/+3
2010-09-29merge-recursive: option to specify rename thresholdLibravatar Kevin Ballard1-0/+1
2010-09-03Merge branch 'dg/local-mod-error-messages'Libravatar Junio C Hamano1-6/+0
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+1
2010-09-03Move set_porcelain_error_msgs to unpack-trees.c and rename itLibravatar Matthieu Moy1-6/+0
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+1
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder1-0/+2
2010-08-11merge-recursive: porcelain messages for checkoutLibravatar Diane Gasselin1-2/+5
2010-08-11Turn unpack_trees_options.msgs into an array + enumLibravatar Matthieu Moy1-2/+2
2010-08-06merge-trees: let caller decide whether to renormalizeLibravatar Jonathan Nieder1-0/+1
2010-06-21Merge branch 'gv/portable'Libravatar Junio C Hamano1-1/+1
2010-05-31enums: omit trailing comma for portabilityLibravatar Gary V. Vaughan1-1/+1
2010-04-01merge: make function try_merge_command non staticLibravatar Christian Couder1-0/+3
2010-03-20merge_trees(): add ancestor label parameter for diff3-style outputLibravatar Jonathan Nieder1-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 17:55:03 +0000