chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: notes re ffq-prev ref name
[dgit.git]
/
NOTES.git-debrebase
diff --git
a/NOTES.git-debrebase
b/NOTES.git-debrebase
index b47391af64b61945aff20d2970eaac49e4585870..8aed2ff28887803b6481e75e4a2997ca59221a65 100644
(file)
--- a/
NOTES.git-debrebase
+++ b/
NOTES.git-debrebase
@@
-8,9
+8,7
@@
# git-ffqrebase finish
# git-ffqrebase status [BRANCH]
#
# 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
#
# 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)
(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
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
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
will-overwrite for each ref
refs/heads/FOO
is
- refs/ffq
rebase
/FOO
+ refs/ffq
-prev
/FOO
========================================
========================================