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