git-debrebase: Provide conclude subcommand

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index ab1990aff7be6c721d2e8629083fbcb994ee3b23..72b48288e7879ef4a799e8065de49a5e08f15bce 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1304,6 +1304,12 @@ sub cmd_stitch () {
     do_stitch($prose);
 }
 
     do_stitch($prose);
 }
 

+sub cmd_conclude () {
+    badusage "no arguments allowed" if @ARGV;
+    do_launder_head 'launder for conclude';
+    do_stitch 'conclude';
+}
+

 sub cmd_convert_from_gbp () {
     badusage "needs 1 optional argument, the upstream git rev"
        unless @ARGV<=1;
 sub cmd_convert_from_gbp () {
     badusage "needs 1 optional argument, the upstream git rev"
        unless @ARGV<=1;

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index ae095c8c194097e794ebd0b441ac6857a9d84df9..8f092c8ce360a15b52133dcd757b79ae89134992 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -48,6 +48,14 @@ If you abort the git-rebase,
 the branch will still have been laundered,
 but everything in the rebase will be undone.
 
 the branch will still have been laundered,
 but everything in the rebase will be undone.
 

+=item git-debrebase conclude
+
+Launder and restitch the branch,
+consuming any ffq-prev.
+
+If the branch is already laundered and stitched, it is an error,
+unless --noop-ok.
+

 =item git-debrebase stitch [--prose=<for commit message>]
 
 Stitch the branch,
 =item git-debrebase stitch [--prose=<for commit message>]
 
 Stitch the branch,