| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Documentation: recursive is the default strategy these days. | Junio C Hamano | 2005-12-08 | 1 | -5/+5 |
| | | | | | | | We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net> | ||||
| * | Refactor merge strategies into separate includable file. | Jon Loeliger | 2005-11-06 | 1 | -0/+35 |
| Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | |||||
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |