chiark
/
gitweb
/
~ijackson
/
talk-2018-dc18-gdr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9e0961
)
a slide done
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2018 09:07:06 +0000
(10:07 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2018 09:07:06 +0000
(10:07 +0100)
talk.txt
patch
|
blob
|
history
diff --git
a/talk.txt
b/talk.txt
index df2538d774334ccac44696639449e0a9eb815cf6..c96d2bd7ed25c09b1fd2840b5480a3b43d63f297 100644
(file)
--- 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