From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 17:14:12 +0000 (+0000)
Subject: git-debrebase: note that we have mostly done the gbp import
X-Git-Tag: archive/debian/5.0~253
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=e6c5fe85824337be49d77f89aa388c82361784e4

git-debrebase: note that we have mostly done the gbp import

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

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