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: do not add -i in default invocation
[dgit.git]
/
NOTES.git-debrebase
diff --git
a/NOTES.git-debrebase
b/NOTES.git-debrebase
index ac6b88b247947ab9b1b0910149e44746b2f2545f..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,16
+206,33
@@
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)
-2. git-debrebase stitch
+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
makes pseudomerge with will-overwrite
deletes will-overwrite
+ we will teach dgit to do
+ git-debrebase stitch
+
3. git-debrebase push
like git push only does stitch first
??? command line parsing!
3. git-debrebase push
like git push only does stitch first
??? command line parsing!
+4. git-debrebase release
+
+ stiches, finalises changelog, signs tags, pushes everything
+ for the future, when there is some automatic builder
+
+will-overwrite for each ref
+ refs/heads/FOO
+is
+ refs/ffq-prev/FOO
+
========================================
import from gbp
========================================
import from gbp