From ac6f8cf1df126cf79e08d431932b76cec83f443a Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Feb 2018 14:56:00 +0000
Subject: git-debrebase: NOTES: tidying up

---
 NOTES.git-debrebase | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'NOTES.git-debrebase')

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 32e5edf..09237d5 100644
--- 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 ?
 
-   clean up remains of NOTES and README
+   clean up remains of README
 
    arrange for dgit to automatically stitch on push
 
-========================================
-
-#  refs/ffq-prev/REF    relates to refs/REF
-
 =======================================
 
 special commit tags
@@ -72,6 +68,8 @@ workflow
 
 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.
 
@@ -155,6 +153,10 @@ N. git-debrebase [--noop-ok] record-ffq-prev
 
     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
 
@@ -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
 
-ffq-prev for each ref
-    refs/heads/FOO
-is
-    refs/ffq-prev/FOO
-
 ========================================
 
 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
-- 
cgit v1.2.3