chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
changelog: finalise 6.6.
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index f4831c3c5b6c4f1a8a23cf58a1ebfeb0c074a7ce..24be35e353f1c716e9a8bfb0d1463bce9f588409 100755
(executable)
--- 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;