diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-10 17:14:12 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
| commit | e6c5fe85824337be49d77f89aa388c82361784e4 (patch) | |
| tree | 2268523e5d58c35764844361fe553168eaff13b7 /NOTES.git-debrebase | |
| parent | 20ffd976c0933f551e667d80737d83849f400d45 (diff) | |
git-debrebase: note that we have mostly done the gbp import
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'NOTES.git-debrebase')
| -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 |