chiark / gitweb /
git-debrebase: Provide conclude subcommand
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Apr 2018 15:12:56 +0000 (16:12 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:07:01 +0000 (16:07 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
git-debrebase.1.pod

index ab1990a..72b4828 100755 (executable)
@@ -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;
index ae095c8..8f092c8 100644 (file)
@@ -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,