From: Ian Jackson Date: Sun, 29 Jul 2018 08:47:10 +0000 (+0100) Subject: new slides wanted from dry run X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=509e1074022d9717a7f793fec41dbe6f76973e07;p=talk-2018-dc18-gdr.git new slides wanted from dry run --- diff --git a/talk.txt b/talk.txt index dbfb420..df2538d 100644 --- a/talk.txt +++ b/talk.txt @@ -206,7 +206,7 @@ wanted the new upstream change to actually come before 2. Maybe it just makes more sense there, or maybe you are going to change patch 3 to make use of it. -===== data model slide with git-debrebase -i overlay +XXX ===== data model slide with git-debrebase -i overlay So, you run git-debrebase -i. The usual git-rebase todo list comes up, and you will see in it what looks like commit C3, and reorder that @@ -231,7 +231,7 @@ breakwater. What about a new upstream version ? -===== data model slide "commit history structure after new-upstream" +XXX ===== 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 @@ -239,6 +239,8 @@ a git commit, of course. (Actually, by default, it hopes to find a tag named after the new upstream version number, but you can tell it explicitly if that's not right.) +===== data model slide "commit history structure after new-upstream" + git-debrebase arranges to include the new upstream source into the breakwater, and then rebases your delta queue series onto that.