From f58777f379b8fea92d8ae4f80c1bba3299d951b3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 22 Apr 2018 16:12:56 +0100
Subject: [PATCH] git-debrebase: Provide conclude subcommand

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 git-debrebase       | 6 ++++++
 git-debrebase.1.pod | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/git-debrebase b/git-debrebase
index ab1990af..72b48288 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1304,6 +1304,12 @@ sub cmd_stitch () {
     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;
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index ae095c8c..8f092c8c 100644
--- 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.
 
+=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,
-- 
2.30.2