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).
Merge pull request #78 from aschrab/grandparent

Don't refer to grandparent commit as second parent