Age | Commit message (Expand) | Author | Files | Lines |
2010-01-17 | Document that merge strategies can now take their own options | Junio C Hamano | 1 | -1/+28 |
2009-11-15 | Documentation: clarify 'ours' merge strategy | Thomas Rast | 1 | -2/+3 |
2009-03-25 | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta | 1 | -7/+7 |
2008-03-19 | Documentation/git-merge: document subtree strategy. | Miklos Vajna | 1 | -0/+7 |
2005-12-08 | Documentation: recursive is the default strategy these days. | Junio C Hamano | 1 | -5/+5 |
2005-11-06 | Refactor merge strategies into separate includable file. | Jon Loeliger | 1 | -0/+35 |