| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | 2008-08-11 |
| 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 : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |