path: root/merge-recursive.h
AgeCommit message (Expand)Author
2022-02-02merge-ort: format messages slightly different for use in headersElijah Newren
2020-08-02merge-recursive: fix unclear and outright wrong commentsElijah Newren
2019-08-19merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_*Elijah Newren
2019-08-19merge-recursive: split internal fields into a separate structElijah Newren
2019-08-19merge-recursive: avoid losing output and leaking memory holding that outputElijah Newren
2019-08-19merge-recursive: comment and reorder the merge_options fieldsElijah Newren
2019-08-19merge-recursive: consolidate unnecessary fields in merge_optionsElijah Newren
2019-08-19merge-recursive: move some definitions around to clean up the headerElijah Newren
2019-08-19merge-recursive: rename merge_options argument to opt in headerElijah Newren
2019-08-19merge-recursive: use common name for ancestors/common/base_listElijah Newren
2019-08-19cache-tree: share code between functions writing an index as a treeElijah Newren
2019-08-19merge-recursive: remove useless parameter in merge_trees()Elijah Newren
2019-08-19merge-recursive: introduce an enum for detect_directory_renames valuesDerrick Stolee
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-09-04Merge branch 'en/directory-renames-nothanks'Junio C Hamano
2018-08-30merge-recursive: add ability to turn off directory rename detectionElijah Newren
2018-08-15Add missing includes and forward declarationsElijah Newren
2018-05-08merge: add merge.renames config settingBen Peart
2018-05-08merge-recursive: fix was_tracked() to quit lying with some renamed pathsElijah Newren
2018-05-08merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-05-08merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren
2018-05-08merge-recursive: add get_directory_renames()Elijah Newren
2018-04-11Revert "Merge branch 'en/rename-directory-detection'"Junio C Hamano
2018-02-27merge-recursive: fix overwriting dirty files involved in renamesElijah Newren
2018-02-14merge-recursive: add computation of collisions due to dir rename & mergingElijah Newren
2018-02-14merge-recursive: add get_directory_renames()Elijah Newren
2017-09-08merge-recursive: change current file dir string_lists to hashmapKevin Willford
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