| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2008-08-11 | Make cherry-pick use rerere for conflict resolution. | Abhijit Menon-Sen | |
| 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: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |