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