summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index f4831c3..24be35e 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1593,6 +1593,9 @@ sub cmd_conclude () {
}
sub cmd_scrap () {
+ if (currently_rebasing()) {
+ runcmd @git, qw(rebase --abort);
+ }
my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
if (!$ffq_prev_commitish) {
fail "No ongoing git-debrebase session." unless $opt_noop_ok;