aboutsummaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
Commit message (Expand)AuthorAge
* git-merge(1): document diff-algorithm option to merge-recursiveJohn Keeping2013-04-05
* merge: teach -Xours/-Xtheirs to binary ll-merge driverJunio C Hamano2012-09-08
* Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano2010-10-26
|\
| * merge-recursive: option to specify rename thresholdKevin Ballard2010-09-29
* | Merge branch 'jf/merge-ignore-ws'Junio C Hamano2010-10-26
|\ \ | |/
| * merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-27
| * merge-recursive --patienceJustin Frankel2010-08-26
* | Use angles for placeholders consistentlyŠtěpán Němec2010-10-08
|/
* merge-recursive --renormalizeJonathan Nieder2010-08-06
* Document that merge strategies can now take their own optionsJunio C Hamano2010-01-17
* Documentation: clarify 'ours' merge strategyThomas Rast2009-11-15
* Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta2009-03-25
* Documentation/git-merge: document subtree strategy.Miklos Vajna2008-03-19
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-08
* Refactor merge strategies into separate includable file.Jon Loeliger2005-11-06