From: Ian Jackson Date: Sun, 29 Jul 2018 09:07:06 +0000 (+0100) Subject: a slide done X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=29f3acf5317eaffbdbb789c603c31889c1ccf7f2;p=talk-2018-dc18-gdr.git a slide done --- diff --git a/talk.txt b/talk.txt index df2538d..c96d2bd 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. -XXX ===== data model slide with git-debrebase -i overlay +===== 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