From e6c5fe85824337be49d77f89aa388c82361784e4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Feb 2018 17:14:12 +0000 Subject: [PATCH] git-debrebase: note that we have mostly done the gbp import Signed-off-by: Ian Jackson --- NOTES.git-debrebase | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.30.2