From: Ian Jackson Date: Sun, 29 Jul 2018 09:13:07 +0000 (+0100) Subject: last extra slide now done X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=bfe12b8e4ce1a69bdc2fd24e238426ef16b32330;p=talk-2018-dc18-gdr.git last extra slide now done --- diff --git a/talk.txt b/talk.txt index c96d2bd..d9a81a9 100644 --- a/talk.txt +++ b/talk.txt @@ -231,7 +231,7 @@ breakwater. What about a new upstream version ? -XXX ===== data model slide "commit history structure before new-upstream" +===== data model slide "commit history structure before new-upstream" To rebase onto a new upstream version, you run git-debrebase new-upstream. git-debrebase expects the upstream code in the form of