X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=builtin-revert.c;h=36677053f87b107f658f1472369755c4fe957a46;hb=1c12b38601b5b4da61a2e90540a8de56261d93af;hp=27881e94937dd79b9a0524eb2d9770427ec4f4fb;hpb=c8a4cbc23916feeae89a7c59523781e8bf8ac103;p=git.git 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)