summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
AgeCommit message (Expand)AuthorFilesLines
2021-08-05Update docs for change of default merge backendLibravatar Elijah Newren1-43/+50
2021-08-05merge-strategies.txt: add coverage of the `ort` merge strategyLibravatar Elijah Newren1-0/+14
2021-08-05merge-strategies.txt: avoid giving special preference to patience algorithmLibravatar Elijah Newren1-5/+1
2021-08-05merge-strategies.txt: do not imply using copy detection is desiredLibravatar Elijah Newren1-3/+3
2021-08-05merge-strategies.txt: update wording for the resolve strategyLibravatar Elijah Newren1-7/+6
2021-08-05Documentation: edit awkward references to `git merge-recursive`Libravatar Elijah Newren1-4/+5
2019-11-11merge-strategies: fix typo "reflected to" to "reflected in"Libravatar Dominic Jäger1-1/+1
2018-05-08merge: add merge.renames config settingLibravatar Ben Peart1-4/+7
2018-03-21Merge branch 'dp/merge-strategy-doc-fix'Libravatar Junio C Hamano1-1/+1
2018-03-19Documentation/merge-strategies: typofixLibravatar David Pursehouse1-1/+1
2017-11-27Merge branch 'jc/ignore-cr-at-eol'Libravatar Junio C Hamano1-2/+3
2017-11-08diff: --ignore-cr-at-eolLibravatar Junio C Hamano1-2/+3
2017-09-25merge-strategies: avoid implying that "-s theirs" existsLibravatar Junio C Hamano1-1/+2
2016-02-22merge-strategies.txt: fix typoLibravatar Felipe Gonçalves Assis1-2/+2
2016-02-17merge-recursive: more consistent interfaceLibravatar Felipe Gonçalves Assis1-4/+6
2016-02-17merge-recursive: option to disable renamesLibravatar Felipe Gonçalves Assis1-0/+6
2014-03-25Merge branch 'rr/doc-merge-strategies'Libravatar Junio C Hamano1-2/+2
2014-03-17Documentation/merge-strategies: avoid hyphenated commandsLibravatar Ramkumar Ramachandra1-2/+2
2014-02-11docs/merge-strategies: remove hyphen from mis-mergesLibravatar Albert L. Lash, IV1-1/+1
2013-12-09Documentation: document pitfalls with 3-way mergeLibravatar brian m. carlson1-0/+8
2013-04-05git-merge(1): document diff-algorithm option to merge-recursiveLibravatar John Keeping1-0/+6
2012-09-08merge: teach -Xours/-Xtheirs to binary ll-merge driverLibravatar Junio C Hamano1-1/+2
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Libravatar Junio C Hamano1-0/+4
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-0/+22
2010-10-08Use angles for placeholders consistentlyLibravatar Štěpán Němec1-1/+1
2010-09-29merge-recursive: option to specify rename thresholdLibravatar Kevin Ballard1-0/+4
2010-08-27merge-recursive: options to ignore whitespace changesLibravatar Justin Frankel1-0/+15
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+7
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-0/+12
2010-01-17Document that merge strategies can now take their own optionsLibravatar Junio C Hamano1-1/+28
2009-11-15Documentation: clarify 'ours' merge strategyLibravatar Thomas Rast1-2/+3
2009-03-25Grammar fixes to "merge" and "patch-id" docsLibravatar Wincent Colaiuta1-7/+7
2008-03-19Documentation/git-merge: document subtree strategy.Libravatar Miklos Vajna1-0/+7
2005-12-08Documentation: recursive is the default strategy these days.Libravatar Junio C Hamano1-5/+5
2005-11-06Refactor merge strategies into separate includable file.Libravatar Jon Loeliger1-0/+35
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 16:04:25 +0000