git-debrebase(1): Be less scary about --experimental-merge-resolution

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

1 files changed, 14 insertions, 4 deletions

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 17e750a..fa61f54 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -554,11 +554,21 @@ Requests (more) debugging.  May be repeated.
 Enable experimental code for handling general merges
 (see L<git-debrebase(5)/General merges>).
 
-This option may generate lossage of various kinds,
+If using this option succeeds,
+the output is likely to be correct,
+although it would be a good idea to check that it seems sane.
+
+If it fails, your tree should be left where it was.
+
+However, there may be lossage of various kinds,
 including misleading error messages,
-references to nonexistent documentation, and
-you being handed an incomprehensible pile of
-multidimensional merge wreckage.
+and references to nonexistent documentation.
+On merge failure,
+it might invite you to delve into
+an incomprehensible pile of
+multidimensional merge wreckage,
+which is supposed to be left in special refs invented for the purpose
+(so, not your working tree, or HEAD).
 
 =back