| Age | Commit message (Expand) | Author |
|---|---|---|
| 2010-01-18 | Document that merge strategies can now take their own options | Junio C Hamano |
| 2009-11-15 | Documentation: clarify 'ours' merge strategy | Thomas Rast |
| 2009-03-26 | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta |
| 2008-03-19 | Documentation/git-merge: document subtree strategy. | Miklos Vajna |
| 2005-12-08 | Documentation: recursive is the default strategy these days. | Junio C Hamano |
| 2005-11-06 | Refactor merge strategies into separate includable file. | Jon Loeliger |
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |