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=ca81c19780a531e5c88215bbbab6f770c61e9560;hb=542f874e8973e59e1dc3c2aa87584e05b8d1bbad;hpb=e66c2cf3f7182a3e6f52945636a807ed4a959d5b

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index ca81c197..7ad1ab9f 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -496,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