X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=blobdiff_plain;f=talk.txt;fp=talk.txt;h=d9a81a90b760b89c469b6612928d1835fd3c4a8e;hb=bfe12b8e4ce1a69bdc2fd24e238426ef16b32330;hp=c96d2bd7ed25c09b1fd2840b5480a3b43d63f297;hpb=85a6b8c6d8a08dc6e2d4ec4085892a37caea275b;p=talk-2018-dc18-gdr.git 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