path: root/Documentation/merge-strategies.txt
AgeCommit message (Expand)Author
2021-08-05Update docs for change of default merge backendElijah Newren
2021-08-05merge-strategies.txt: add coverage of the `ort` merge strategyElijah Newren
2021-08-05merge-strategies.txt: avoid giving special preference to patience algorithmElijah Newren
2021-08-05merge-strategies.txt: do not imply using copy detection is desiredElijah Newren
2021-08-05merge-strategies.txt: update wording for the resolve strategyElijah Newren
2021-08-05Documentation: edit awkward references to `git merge-recursive`Elijah Newren
2019-11-11merge-strategies: fix typo "reflected to" to "reflected in"Dominic Jäger
2018-05-08merge: add merge.renames config settingBen Peart
2018-03-21Merge branch 'dp/merge-strategy-doc-fix'Junio C Hamano
2018-03-19Documentation/merge-strategies: typofixDavid Pursehouse
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano
2017-11-08diff: --ignore-cr-at-eolJunio C Hamano
2017-09-25merge-strategies: avoid implying that "-s theirs" existsJunio C Hamano
2016-02-22merge-strategies.txt: fix typoFelipe Gonçalves Assis
2016-02-17merge-recursive: more consistent interfaceFelipe Gonçalves Assis
2016-02-17merge-recursive: option to disable renamesFelipe Gonçalves Assis
2014-03-25Merge branch 'rr/doc-merge-strategies'Junio C Hamano
2014-03-17Documentation/merge-strategies: avoid hyphenated commandsRamkumar Ramachandra
2014-02-11docs/merge-strategies: remove hyphen from mis-mergesAlbert L. Lash, IV
2013-12-09Documentation: document pitfalls with 3-way mergebrian m. carlson
2013-04-05git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping
2012-09-09merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano
2010-10-27Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano
2010-10-27Merge branch 'jf/merge-ignore-ws'Junio C Hamano
2010-10-08Use angles for placeholders consistentlyŠtěpán Němec
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard
2010-08-27merge-recursive: options to ignore whitespace changesJustin Frankel
2010-08-26merge-recursive --patienceJustin Frankel
2010-08-06merge-recursive --renormalizeJonathan Nieder
2010-01-18Document that merge strategies can now take their own optionsJunio C Hamano
2009-11-15Documentation: clarify 'ours' merge strategyThomas Rast
2009-03-26Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta
2008-03-19Documentation/git-merge: document subtree strategy.Miklos Vajna
2005-12-08Documentation: recursive is the default strategy these days.Junio C Hamano
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger