chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
100c26f
)
git-debrebase: NOTES: tidying up
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 14:56:00 +0000
(14:56 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:59 +0000
(16:06 +0100)
NOTES.git-debrebase
patch
|
blob
|
history
diff --git
a/NOTES.git-debrebase
b/NOTES.git-debrebase
index 32e5edfee655e9002c8559e7414f036755cfdfb8..09237d5973cda501e24ecb4acb4b73c7e4a45a51 100644
(file)
--- a/
NOTES.git-debrebase
+++ b/
NOTES.git-debrebase
@@
-6,14
+6,10
@@
TODO
dgit-maint-debrebase(7)
someone should set branch.<name>.mergeOptions to include --ff-only ?
dgit-maint-debrebase(7)
someone should set branch.<name>.mergeOptions to include --ff-only ?
- clean up remains of
NOTES and
README
+ clean up remains of README
arrange for dgit to automatically stitch on push
arrange for dgit to automatically stitch on push
-========================================
-
-# refs/ffq-prev/REF relates to refs/REF
-
=======================================
special commit tags
=======================================
special commit tags
@@
-72,6
+68,8
@@
workflow
Theory for ffq-prev
Theory for ffq-prev
+ refs/ffq-prev/REF relates to refs/REF
+
When we strip a pm, we need to maybe record it (or something) as the
new start point.
When we strip a pm, we need to maybe record it (or something) as the
new start point.
@@
-155,6
+153,10
@@
N. git-debrebase [--noop-ok] record-ffq-prev
we will teach dgit to do
git-debrebase stitch
we will teach dgit to do
git-debrebase stitch
+ or some such ?
+
+following parts are not implemented and maybe aren't the
+best subcommand names etc.
3. git-debrebase push
3. git-debrebase push
@@
-166,11
+168,6
@@
N. git-debrebase [--noop-ok] record-ffq-prev
stiches, finalises changelog, signs tags, pushes everything
for the future, when there is some automatic builder
stiches, finalises changelog, signs tags, pushes everything
for the future, when there is some automatic builder
-ffq-prev for each ref
- refs/heads/FOO
-is
- refs/ffq-prev/FOO
-
========================================
import from gbp
========================================
import from gbp
@@
-224,6
+221,8
@@
current avaiable strategies:
========================================
========================================
+For downstreams of Debian, sketch of git-ffqrebase
+
# git-ffqrebase start [BASE]
# # records previous HEAD so it can be overwritten
# # records base for future git-ffqrebase
# git-ffqrebase start [BASE]
# # records previous HEAD so it can be overwritten
# # records base for future git-ffqrebase