pcottle/learnGitBranching — pull request #78 by aschrab (2013-03-20 21:22:30+00:00)
Title: Don't refer to grandparent commit as second parent

The term "second parent" has a specific meaning in git that is distinct
from a grandparent, so avoid referring to a grandparent (~2) as a second
parent (^2).