summaryrefslogtreecommitdiff
path: root/NOTES.git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-15 13:52:50 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commitf8ea491fa27e80e4f2fac287d01071b8b27861cc (patch)
tree8f2a33d82ce30492188f497b160ca73c35225e8f /NOTES.git-debrebase
parent0a6aa3314826244b848ca1b6efa2e0d3b17318a0 (diff)
git-debrebase: notes re ffq-prev ref name
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'NOTES.git-debrebase')
-rw-r--r--NOTES.git-debrebase10
1 files changed, 4 insertions, 6 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index b47391a..8aed2ff 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
@@ -208,11 +206,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)
-N. git-debrebase record-ffqrebase
+N. git-debrebase [--noop-ok] record-ffq-prev
does what is described above
-2. git-debrebase stitch [--noop-ok]
+2. git-debrebase [--noop-ok] stitch
makes pseudomerge with will-overwrite
deletes will-overwrite
@@ -233,7 +231,7 @@ N. git-debrebase record-ffqrebase
will-overwrite for each ref
refs/heads/FOO
is
- refs/ffqrebase/FOO
+ refs/ffq-prev/FOO
========================================