diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-04 14:31:41 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-04 14:32:14 +0100 |
commit | 76b90289f6bbd304e35d984cebd28a1cbc14d4fe (patch) | |
tree | 04d4ad5607a47f92762a69517e599bc54f7baf1e | |
parent | bc3be36a946aeb6485259be594645c3c3d69550f (diff) |
git-debrebase: scrap: Run git-rebase --abort if applicable
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 3 | ||||
-rw-r--r-- | git-debrebase.1.pod | 2 |
2 files changed, 5 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; diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 28f3084..fe65674 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -111,6 +111,8 @@ because that launders the branch too. Throws away all the work since the branch was last stitched. This is done by rewinding you to ffq-prev. +If you are in the middle of a git-rebase, will abort that too. + =item git-debrebase new-upstream <new-version> [<upstream-details>...] Rebases the delta queue |