X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=73251706a73c1036ee8a00a87ea43db4bb2da11b;hb=b5bf8a0f318806562b3089ce8a84d864ee2b3f0f;hp=8f092c8ce360a15b52133dcd757b79ae89134992;hpb=f58777f379b8fea92d8ae4f80c1bba3299d951b3;p=dgit.git

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 8f092c8c..73251706 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -29,10 +29,13 @@ which defines many important terms used here.
 
 =item git-debrebase [-- <git-rebase options...>]
 
+=item git-debrebase [-i <further git-rebase options...>]
+
 Unstitches and launders the branch.
 (See L</UNSTITCHING AND LAUNDERING> below.)
 
-Then optionally edits the Debian delta queue,
+Then, if any git-rebase options were supplied,
+edits the Debian delta queue,
 using git-rebase, by running
 
     git rebase <git-rebase options> <breakwater-tip>
@@ -48,18 +51,36 @@ If you abort the git-rebase,
 the branch will still have been laundered,
 but everything in the rebase will be undone.
 
+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
 
-Launder and restitch the branch,
-consuming any ffq-prev.
+Finishes a git-debrebase session,
+tidying up the branch and making it fast forward again.
 
-If the branch is already laundered and stitched, it is an error,
+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, does nothing.
+
+=item git-debrebase prepush [--prose=<for commit message>]
+
 =item git-debrebase stitch [--prose=<for commit message>]
 
-Stitch the branch,
+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.