test-suite: lib-gdr: Be more defensive about unexpected states/args

[dgit.git] / git-debrebase.5.pod

diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index d39ad9484986fb022e98e735a030d91f6e136063..f641a70fe756fd8147c82e86c40335d26041c29b 100644 (file)
--- a/git-debrebase.5.pod
+++ b/git-debrebase.5.pod
@@ -527,6 +527,21 @@ If you add patches your work is likely to be discarded.
 Instead of editing patches,
 use git-debrebase to edit the corresponding commits.
 
+=item Renaming (etc.) branch while unstitched
+
+The previous HEAD,
+which will be pseudomerged over
+by operations like git-debrebase stitch,
+is recorded in a ref name dervied from your branch name.
+
+If you rename unstitched branches,
+this information can get out of step.
+
+Conversely,
+creating a new branch from an unstitched branch
+is good for making a branch to play about in,
+but the result cannot be stitched.
+
 =back
 
 =head1 COMMIT MESSAGE ANNOTATIONS
@@ -556,6 +571,8 @@ The full set of annotations is:
   [git-debrebase anchor: declare upstream]
   [git-debrebase pseudomerge: stitch]
 
+  [git-debrebase merged-breakwater: constructed from vanilla merge]
+
   [git-debrebase convert-to-gbp: commit patches]
 
 Only anchor merges have the C<[git-debrebase anchor: ...]> tag.