| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-12 | 1 | -0/+45 |
| Cherry-picking can be helped by reusing previous confliction resolution by invoking rerere automatically. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||||
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |