That's a good point, thanks for clarifying. In case anyone else is still reading, it's (ideally) a fast-forward merge. Fig 3-30 shows this:

http://git-scm.com/book/en/Git-Branching-Rebasing

So I guess I'm starting to see how these are somewhat the same thing in the end, just from different perspectives. Thanks again.