X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=7ad1ab9fe3765c03d39e510b20f2672bce81507a;hp=28f3084816064107440ab23f938091d4079269c1;hb=542f874e8973e59e1dc3c2aa87584e05b8d1bbad;hpb=b58f7c61452fc5b8b7d70f735283ecdc1b5e8ac3

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 28f30848..7ad1ab9f 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -95,22 +95,30 @@ If the branch is already laundered and stitched, does nothing.
 
 =item git-debrebase prepush [--prose=<for commit message>]
 
+If the branch is unstitched,
+stitches it,
+consuming ffq-prev.
+
+This is a good command to run before pushing to a git server.
+You should consider using B<conclude> instead,
+because that launders the branch too.
+
 =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.
 
-You should consider using B<conclude> instead,
-because that launders the branch too.
+You should consider using B<prepush> or B<conclude> instead.
 
 =item git-debrebase scrap
 
 Throws away all the work since the branch was last stitched.
 This is done by rewinding you to ffq-prev.
 
+If you are in the middle of a git-rebase, will abort that too.
+
 =item git-debrebase new-upstream <new-version> [<upstream-details>...]
 
 Rebases the delta queue
@@ -488,6 +496,20 @@ This is provided mostly for the benefit of the test suite.
 
 Requests (more) debugging.  May be repeated.
 
+=item --experimntal-merge-resolution
+
+Enable experimental code for handling general merges
+(see L<git-debrebase(5)/General merges>).
+
+This option may generate branch structures that
+require the use of this same option by other people.
+Also you may experience lossage of various kinds,
+including false error messages,
+references to nonexistent documentation,
+being handed an incomprehensible pile of
+multidimensional merge wreckage,
+and/or possible mangling of your package's source code.
+
 =back
 
 =head1 UNSTITCHING AND LAUNDERING