summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0a6aa33)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
# 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
(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
will-overwrite for each ref
refs/heads/FOO
is
will-overwrite for each ref
refs/heads/FOO
is
========================================
========================================