X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.1.pod;h=04a57ee25a5ecbb9c76d04cb407faa3c5b83beb0;hb=8381243a5f0a311bdf8ef2c8d695d7993de76a9d;hp=7ad1ab9fe3765c03d39e510b20f2672bce81507a;hpb=7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5;p=dgit.git

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 7ad1ab9f..04a57ee2 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -422,6 +422,20 @@ and it should not be necessary.
 
 =back
 
+=item git-debrebase forget-was-ever-debrebase
+
+Deletes the ffq-prev and debrebase-last refs
+associated with this branch,
+that git-debrebase and dgit use to determine
+whether this branch is managed by git-debrebase,
+and what previous head may need to be stitched back in.
+
+This can be useful if you were just playing with git-debrebase,
+and have used git-reset --hard to go back to a commit
+before your experiments.
+
+Do not use this if you expect to run git-debrebase on the branch again.
+
 =back
 
 =head1 OPTIONS
@@ -501,14 +515,11 @@ Requests (more) debugging.  May be repeated.
 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.
+This option may generate lossage of various kinds,
+including misleading error messages,
+references to nonexistent documentation, and
+you being handed an incomprehensible pile of
+multidimensional merge wreckage.
 
 =back