X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.1.pod;h=1156825c8a92831c55507a115b92413ace15fe16;hp=ca81c19780a531e5c88215bbbab6f770c61e9560;hb=c9cee6bd30b9f24677896da40c17f28fe81fb495;hpb=e66c2cf3f7182a3e6f52945636a807ed4a959d5b

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index ca81c197..1156825c 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
@@ -496,6 +510,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