diff options
| -rwxr-xr-x | git-debrebase | 6 | ||||
| -rw-r--r-- | git-debrebase.1.pod | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase index ab1990a..72b4828 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 ae095c8..8f092c8 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, |