X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=NOTES.git-debrebase;h=32f9b494869a6665d66d6aa9601d6f908e4e1ac0;hb=0943c19e7dcccf0ac05fb266b232a9c36781264e;hp=c5b2e23bd794d873d6ea6913386267743efd3b7a;hpb=8cb940dbc6a36ca9db9c38428a5d5031837e68f4;p=dgit.git

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index c5b2e23b..32f9b494 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -8,9 +8,7 @@
 #    git-ffqrebase finish
 #    git-ffqrebase status [BRANCH]
 #
-#  refs/ffqrebase-prev/BRANCH    BRANCH may be refs/...; if not it means
-#  refs/ffqrebase-base/BRANCH      refs/heads/BRANCH
-#                               zero, one, or both of these may exist
+#  refs/ffq-prev/REF    relates to refs/REF
 #
 # git-debrebase without start, if already started, is willing
 # to strip pseudomerges provided that they overwrite exactly
@@ -44,6 +42,7 @@ overall format
 
 [git-debrebase: gbp2debrebase, drop patches]
 [git-debrebase breakwater: declare upstream]
+[git-debrebase pseudomerge: stitch]
 
 m{^\[git-debrebase (?:\w*-)?upstream combine \.((?: $extra_orig_namepart_re)+)\]}
 
@@ -208,7 +207,11 @@ They should be made just before (ideally, part of) dgit push.
         (optionally, can use some other commit which is ff
          from all of the above, eg one of them)
 
-2. git-debrebase stitch [--noop-ok]
+N. git-debrebase [--noop-ok] record-ffq-prev
+
+     does what is described above
+
+2. git-debrebase [--noop-ok] stitch
 
     makes pseudomerge with will-overwrite
     deletes will-overwrite
@@ -229,7 +232,7 @@ They should be made just before (ideally, part of) dgit push.
 will-overwrite for each ref
     refs/heads/FOO
 is
-    refs/ffrebase/FOO
+    refs/ffq-prev/FOO
 
 ========================================