X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=c353111249ee99edb70d069528e94da938fe8af5;hb=626c5a5851ebabb54e01e3fe3e15b3971f62555b;hp=5fabfd6762e7a3d407521cafe17047ad5bb242e0;hpb=542f874e8973e59e1dc3c2aa87584e05b8d1bbad;p=dgit.git diff --git a/git-debrebase b/git-debrebase index 5fabfd67..c3531112 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