X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=NOTES.git-debrebase;h=c5b2e23bd794d873d6ea6913386267743efd3b7a;hb=8cb940dbc6a36ca9db9c38428a5d5031837e68f4;hp=ac6b88b247947ab9b1b0910149e44746b2f2545f;hpb=3b8767bcfc8fd709e0f70d876617e69de809e787;p=dgit.git diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index ac6b88b2..c5b2e23b 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -208,16 +208,29 @@ 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) -2. git-debrebase stitch +2. git-debrebase stitch [--noop-ok] 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! +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/ffrebase/FOO + ======================================== import from gbp