| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use angles for placeholders consistently | Štěpán Němec | 2010-10-08 | 1 | -1/+1 |
| * | merge-recursive --renormalize | Jonathan Nieder | 2010-08-06 | 1 | -0/+12 |
| * | Document that merge strategies can now take their own options | Junio C Hamano | 2010-01-17 | 1 | -1/+28 |
| * | Documentation: clarify 'ours' merge strategy | Thomas Rast | 2009-11-15 | 1 | -2/+3 |
| * | Grammar fixes to "merge" and "patch-id" docs | Wincent Colaiuta | 2009-03-25 | 1 | -7/+7 |
| * | Documentation/git-merge: document subtree strategy. | Miklos Vajna | 2008-03-19 | 1 | -0/+7 |
| * | Documentation: recursive is the default strategy these days. | Junio C Hamano | 2005-12-08 | 1 | -5/+5 |
| * | Refactor merge strategies into separate includable file. | Jon Loeliger | 2005-11-06 | 1 | -0/+35 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |