summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
Commit message (Expand)AuthorAgeFilesLines
* 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