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