Merge branch 'aw/rebase-i-stop-on-failure-to-amend'

diff --git a/builtin/revert.c b/builtin/revert.c
index c0b259225146d4712e82e61805210a0327a3c27a..1ea525c10e4c00b66006bf46465ebd490823f25f 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -942,6 +942,7 @@ static int sequencer_rollback(struct replay_opts *opts)
        }
        if (reset_for_rollback(sha1))
                goto fail;
+       remove_sequencer_state(1);
        strbuf_release(&buf);
        return 0;
 fail: