chiark / gitweb /
git-debrebase: note that we have mostly done the gbp import
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Feb 2018 17:14:12 +0000 (17:14 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
NOTES.git-debrebase

index 95ad453..4d7cf20 100644 (file)
@@ -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