X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=NOTES.git-debrebase;h=ac6b88b247947ab9b1b0910149e44746b2f2545f;hb=3b8767bcfc8fd709e0f70d876617e69de809e787;hp=e0a67b5b3ea470d09614934c131e5fc7c8ddf675;hpb=7c3763c866d9cca28d2f4d2368028d708694e3e9;p=dgit.git

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index e0a67b5b..ac6b88b2 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -174,6 +174,52 @@ so that the overall result will be series of pseudomerges.
 
 ========================================
 
+So, pm handling specifics:
+
+strategy is to avoid making needless pseudomerges
+pseudomerges that exist will be preserved
+(by being included in will-overwrite)
+
+This is good because the presence of a pseudomerge means we know we
+want to keep it; and that allows explicit control over history detail
+level.
+
+It does mean we must avoid making the pseudomerges unnecessarily.
+They should be made just before (ideally, part of) dgit push.
+
+1. git-debrebase [-i etc.]
+
+     should:
+        check for will-overwrite
+        if is already a will-overwrite, fine, do no more
+        if not:
+
+        check our origin branch exists and we are ff from it
+        if not fail
+
+        check our other might-be-pushed to branches
+        check we are ff from them
+        if not fail
+
+        set will-overwrite to something which is ff from
+          all above branches
+
+        we use our tip, as discussed above
+        (optionally, can use some other commit which is ff
+         from all of the above, eg one of them)
+
+2. git-debrebase stitch
+
+    makes pseudomerge with will-overwrite
+    deletes will-overwrite
+
+3. git-debrebase push
+
+    like git push only does stitch first
+    ??? command line parsing!
+
+========================================
+
 import from gbp
 
 [ all this is done now: