aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/merge-strategies.txt
AgeCommit message (Expand)AuthorFilesLines
2021-08-05Update docs for change of default merge backendElijah Newren1-43/+50
2021-08-05merge-strategies.txt: add coverage of the `ort` merge strategyElijah Newren1-0/+14
2021-08-05merge-strategies.txt: avoid giving special preference to patience algorithmElijah Newren1-5/+1
2021-08-05merge-strategies.txt: do not imply using copy detection is desiredElijah Newren1-3/+3
2021-08-05merge-strategies.txt: update wording for the resolve strategyElijah Newren1-7/+6
2021-08-05Documentation: edit awkward references to `git merge-recursive`Elijah Newren1-4/+5
2019-11-11merge-strategies: fix typo "reflected to" to "reflected in"Dominic Jäger1-1/+1
2018-05-08merge: add merge.renames config settingBen Peart1-4/+7
2018-03-21Merge branch 'dp/merge-strategy-doc-fix'Junio C Hamano1-1/+1
2018-03-19Documentation/merge-strategies: typofixDavid Pursehouse1-1/+1
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano1-2/+3
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano1-2/+3
2017-09-25merge-strategies: avoid implying that "-s theirs" existsJunio C Hamano1-1/+2
2016-02-22merge-strategies.txt: fix typoFelipe Gonçalves Assis1-2/+2
2016-02-17merge-recursive: more consistent interfaceFelipe Gonçalves Assis1-4/+6
2016-02-17merge-recursive: option to disable renamesFelipe Gonçalves Assis1-0/+6
2014-03-25Merge branch 'rr/doc-merge-strategies'Junio C Hamano1-2/+2
2014-03-17Documentation/merge-strategies: avoid hyphenated commandsRamkumar Ramachandra1-2/+2
2014-02-11docs/merge-strategies: remove hyphen from mis-mergesAlbert L. Lash, IV1-1/+1
2013-12-09Documentation: document pitfalls with 3-way mergebrian m. carlson1-0/+8
2013-04-05git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping1-0/+6
2012-09-08merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano1-1/+2
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano1-0/+4
2010-10-26Merge branch 'jf/merge-ignore-ws'Junio C Hamano1-0/+22
2010-10-08Use angles for placeholders consistentlyŠtěpán Němec1-1/+1
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard1-0/+4
2010-08-27merge-recursive: options to ignore whitespace changesJustin Frankel1-0/+15
2010-08-26merge-recursive --patienceJustin Frankel1-0/+7
2010-08-06merge-recursive --renormalizeJonathan Nieder1-0/+12
2010-01-17Document that merge strategies can now take their own optionsJunio C Hamano1-1/+28
2009-11-15Documentation: clarify 'ours' merge strategyThomas Rast1-2/+3
2009-03-25Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta1-7/+7
2008-03-19Documentation/git-merge: document subtree strategy.Miklos Vajna1-0/+7
2005-12-08Documentation: recursive is the default strategy these days.Junio C Hamano1-5/+5
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger1-0/+35
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-06 11:39:30 +0000