X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=636ff765cae06141f024e13b7eed023b6851a32c;hp=00d2f575a6d29361fdc7ddf397f0e1a9be7348db;hb=8b875c05ff728c9335f692ccc21c5abfe2203d26;hpb=bdeb85eacfd821cad3e1be0bc844dff5671389b7 diff --git a/git-debrebase b/git-debrebase index 00d2f575..636ff765 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1325,6 +1325,19 @@ sub cmd_quick () { do_stitch 'quick'; } +sub cmd_conclude () { + my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info(); + if (!$ffq_prev_commitish) { + fail "No ongoing git-debrebase session." unless $opt_noop_ok; + return; + } + my $dangling_head = get_head(); + + badusage "no arguments allowed" if @ARGV; + do_launder_head 'launder for git-debrebase quick'; + do_stitch 'quick'; +} + sub cmd_convert_from_gbp () { badusage "needs 1 optional argument, the upstream git rev" unless @ARGV<=1;