X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=NOTES.git-debrebase;h=4d7cf20f26912c40babad44d646d5832b31612f5;hp=95ad453e0c271d9aaa2a767df3e5be02060df02b;hb=e6c5fe85824337be49d77f89aa388c82361784e4;hpb=20ffd976c0933f551e667d80737d83849f400d45;ds=sidebyside

diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase
index 95ad453e..4d7cf20f 100644
--- a/NOTES.git-debrebase
+++ b/NOTES.git-debrebase
@@ -176,6 +176,7 @@ so that the overall result will be series of pseudomerges.
 
 import from gbp
 
+[ all this is done now:
  inputs:
    current HEAD (patches-unapplied),
      this is going to be the base of the old breakwater
@@ -194,6 +195,7 @@ import from gbp
        commit to remove d/patches
        breakwater pseudomerge with upstream
        "rebase" of pq branch, each commit with d/patches stripped
+]
 
 what about dgit view branch ?
 ideally, would make pseudomerge over dgit view