summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
Commit message (Expand)AuthorAgeFilesLines
* Update docs for change of default merge backendElijah Newren2021-08-051-43/+50
* merge-strategies.txt: add coverage of the `ort` merge strategyElijah Newren2021-08-051-0/+14
* merge-strategies.txt: avoid giving special preference to patience algorithmElijah Newren2021-08-051-5/+1
* merge-strategies.txt: do not imply using copy detection is desiredElijah Newren2021-08-051-3/+3
* merge-strategies.txt: update wording for the resolve strategyElijah Newren2021-08-051-7/+6
* Documentation: edit awkward references to `git merge-recursive`Elijah Newren2021-08-051-4/+5
* merge-strategies: fix typo "reflected to" to "reflected in"Dominic Jäger2019-11-111-1/+1
* merge: add merge.renames config settingBen Peart2018-05-081-4/+7
* Merge branch 'dp/merge-strategy-doc-fix'Junio C Hamano2018-03-211-1/+1
|\
| * Documentation/merge-strategies: typofixdp/merge-strategy-doc-fixDavid Pursehouse2018-03-191-1/+1
* | Merge branch 'jc/ignore-cr-at-eol'Junio C Hamano2017-11-271-2/+3
|\ \ | |/ |/|
| * diff: --ignore-cr-at-eoljc/ignore-cr-at-eolJunio C Hamano2017-11-081-2/+3
* | merge-strategies: avoid implying that "-s theirs" existsjc/merge-x-theirs-docfixJunio C Hamano2017-09-251-1/+2
|/
* merge-strategies.txt: fix typoFelipe Gonçalves Assis2016-02-221-2/+2
* merge-recursive: more consistent interfaceFelipe Gonçalves Assis2016-02-171-4/+6
* merge-recursive: option to disable renamesFelipe Gonçalves Assis2016-02-171-0/+6
* Merge branch 'rr/doc-merge-strategies'Junio C Hamano2014-03-251-2/+2
|\
| * Documentation/merge-strategies: avoid hyphenated commandsrr/doc-merge-strategiesRamkumar Ramachandra2014-03-171-2/+2
* | docs/merge-strategies: remove hyphen from mis-mergesAlbert L. Lash, IV2014-02-111-1/+1
* | Documentation: document pitfalls with 3-way mergebc/doc-merge-no-op-revertbrian m. carlson2013-12-091-0/+8
|/
* git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping2013-04-051-0/+6
* merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-081-1/+2
* Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-261-0/+4
|\
| * merge-recursive: option to specify rename thresholdKevin Ballard2010-09-291-0/+4
* | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-261-0/+22
|\ \ | |/
| * merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-271-0/+15
| * merge-recursive --patienceJustin Frankel2010-08-261-0/+7
* | Use angles for placeholders consistentlyŠtěpán Němec2010-10-081-1/+1
|/
* merge-recursive --renormalizeJonathan Nieder2010-08-061-0/+12
* Document that merge strategies can now take their own optionsJunio C Hamano2010-01-171-1/+28
* Documentation: clarify 'ours' merge strategyThomas Rast2009-11-151-2/+3
* Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta2009-03-251-7/+7
* Documentation/git-merge: document subtree strategy.Miklos Vajna2008-03-191-0/+7
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-081-5/+5
* Refactor merge strategies into separate includable file.Jon Loeliger2005-11-061-0/+35
View Lorry Controller Status