From aef97ecd0943d090b354394c66f121c6fa0c997c Mon Sep 17 00:00:00 2001 From: Aaron Schrab Date: Wed, 20 Mar 2013 16:53:34 -0400 Subject: [PATCH] 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). --- src/levels/rampup/2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/levels/rampup/2.js b/src/levels/rampup/2.js index 9c866426..4c592591 100644 --- a/src/levels/rampup/2.js +++ b/src/levels/rampup/2.js @@ -48,7 +48,7 @@ exports.level = { "", "So saying `master^` is equivalent to \"the first parent of `master`\".", "", - "`master^^` is the second parent (or grandparent) of `master`", + "`master^^` is the grandparent (second-generation ancestor) of `master`", "", "Let's check out the commit above master here" ],