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:
85a6b8c
)
last extra slide now done
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2018 09:13:07 +0000
(10:13 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2018 09:13:07 +0000
(10:13 +0100)
talk.txt
patch
|
blob
|
history
diff --git
a/talk.txt
b/talk.txt
index c96d2bd7ed25c09b1fd2840b5480a3b43d63f297..d9a81a90b760b89c469b6612928d1835fd3c4a8e 100644
(file)
--- 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