path: root/Documentation/merge-strategies.txt
AgeCommit message (Expand)Author
2010-01-18Document that merge strategies can now take their own optionsJunio C Hamano
2009-11-15Documentation: clarify 'ours' merge strategyThomas Rast
2009-03-26Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta
2008-03-19Documentation/git-merge: document subtree strategy.Miklos Vajna
2005-12-08Documentation: recursive is the default strategy these days.Junio C Hamano
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger