git-debrebase: more notes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index ac6b88b247947ab9b1b0910149e44746b2f2545f..c5b2e23bd794d873d6ea6913386267743efd3b7a 100644 (file)
--- 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)
 
         (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
 
 
     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/ffrebase/FOO
+

 ========================================
 
 import from gbp
 ========================================
 
 import from gbp