X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=NOTES.git-debrebase;h=5a6ff88215ecf1aad496836dd7c4d27a8748bd08;hb=952789d95a825aff6524ec45829ed0d9bfd50f6d;hp=508d590c88d51d44b604cefff63fda6fc0f63bb6;hpb=b822b6c13035de35290d03c497fdbd72560e3d34;p=dgit.git

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 508d590c..5a6ff882 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -1,6 +1,5 @@
 TODO
    reference docs
-      git-debrebase(5)   data model
       git-debrebase(1)   command line
    tutorial
       dgit-maint-debrebase(7)
@@ -85,35 +84,11 @@ We check we are ff from remotes before recording new ffq-prev
 
   ---------- now follows much the same info in different words ----------
 
-1. git-debrebase [-i etc.]
-
-     should:
-        check for ffq-prev
-        if is already a ffq-prev, 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 ffq-prev 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)
-
 N. git-debrebase [--noop-ok] record-ffq-prev
 
      does what is described above
 
-2. git-debrebase [--noop-ok] stitch
-
-    makes pseudomerge with ffq-prev
-    deletes ffq-prev
+Re git-debrebase [--noop-ok] stitch
 
     we will teach dgit to do
        git-debrebase stitch