From aa1a0111cc0e2a12c21ed05c88d8e9872fc166b2 Mon Sep 17 00:00:00 2001 From: Abhijit Menon-Sen Date: Sun, 10 Aug 2008 17:18:55 +0530 Subject: Make cherry-pick use rerere for conflict resolution. Cherry-picking can be helped by reusing previous confliction resolution by invoking rerere automatically. Signed-off-by: Abhijit Menon-Sen Signed-off-by: Junio C Hamano --- builtin-revert.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin-revert.c') diff --git a/builtin-revert.c b/builtin-revert.c index 27881e949..36677053f 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -11,6 +11,7 @@ #include "cache-tree.h" #include "diff.h" #include "revision.h" +#include "rerere.h" /* * This implements the builtins revert and cherry-pick. @@ -395,6 +396,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) die ("Error wrapping up %s", defmsg); fprintf(stderr, "Automatic %s failed.%s\n", me, help_msg(commit->object.sha1)); + rerere(); exit(1); } if (commit_lock_file(&msg_file) < 0) -- cgit v1.2.1