git-debrebase: Do not mind stitching an unlaundered branch

[dgit.git] / git-debrebase.1.pod

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 556a44223d6673c862d81cff7aa66bf91f82494f..9f82a7c311365bc43b171891d3294cc34be1dfb0 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -55,23 +55,37 @@ The options for git-rebase must either start with C<-i>,
 or be prececded by C<-->,
 to distinguish them from options for git-debrebase.
 
+=item git-debrebase conclude
+
+Finishes a git-debrebase session,
+tidying up the branch and making it fast forward again.
+
+Specifically: if the branch is unstitched,
+launders and restitches it,
+making a new pseudomerge.
+Otherwise, it is an error,
+unless --noop-ok.
+
 =item git-debrebase quick
 
 Unconditionally launders and restitches the branch,
 consuming any ffq-prev
 and making a new pseudomerge.
 
-If the branch is already laundered and stitched, it is an error,
-unless --noop-ok.
+If the branch is already laundered and stitched, does nothing.
+
+=item git-debrebase prepush [--prose=<for commit message>]
 
 =item git-debrebase stitch [--prose=<for commit message>]
 
 Stitches the branch,
 consuming ffq-prev.
+This is a good command to run before pushing to a git server.
 
 If there is no ffq-prev, it is an error, unless --noop-ok.
 
-It is a snag (see B<-f>) if the branch is not laundered.
+You should consider using B<conclude> instead,
+because that launders the branch too.
 
 =item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...]