summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-24 21:31:49 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-08-24 21:31:49 +0100
commit45abe880e0efbdc3834168f4fd384678e1c30a51 (patch)
treea7a3ab1d901b9b1048a34bad24533e8914458eba /git-debrebase
parent50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f (diff)
git-debrebase: forget-was-ever-debrebase: New subcommand
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase12
1 files changed, 12 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index 5fabfd6..c353111 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2838,6 +2838,18 @@ END
'convert-from-dgit-view';
}
+sub cmd_forget_was_ever_debrebase () {
+ badusage "forget-was-ever-debrebase takes no further arguments" if @ARGV;
+ my ($ffqstatus, $ffq_msg, $current, $ffq_prev, $gdrlast) =
+ ffq_prev_branchinfo();
+ fail "Not suitable for recording git-debrebaseness anyway: $ffq_msg"
+ if defined $ffq_msg;
+ push @deferred_updates, "delete $ffq_prev";
+ push @deferred_updates, "delete $gdrlast";
+ snags_maybe_bail();
+ run_deferred_updates "forget-was-ever-debrebase";
+}
+
sub cmd_record_resolved_merge () {
badusage "record-resolved-merge takes no further arguments" if @ARGV;
# MERGE-TODO needs documentation