Andrew's git / gitweb.git / diff
?
Make cherry-pick use rerere for conflict resolution.
authorAbhijit Menon-Sen <ams@toroid.org>
Sun, 10 Aug 2008 11:48:55 +0000 (17:18 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Aug 2008 23:42:49 +0000 (16:42 -0700)
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>
No differences found