I believe there is a typo in the branching and merging documentation located here: http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging In the diagram labeled "A merge commit", shouldn't the commit that "Master" points to be labeled "C6", not "C5"?