Merge pull request #78 from aschrab/grandparent

Don't refer to grandparent commit as second parent
pcottle · Mar 20, 2013 · 8f9986f · 8f9986f
2 parents 6822350 + aef97ec
commit 8f9986f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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"
             ],