diff options
-rw-r--r-- | NOTES.git-debrebase | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index 95ad453..4d7cf20 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 |