mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-10 14:44:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't refer to grandparent commit as second parent

Browse source 
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).
This commit is contained in:
Aaron Schrab 2013-03-20 16:53:34 -04:00
parent 68223505ce
commit aef97ecd09
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/levels/rampup/2.js
View file

@ -48,7 +48,7 @@ exports.level = {
"", "",
"So saying `master^` is equivalent to \"the first parent of `master`\".", "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" "Let's check out the commit above master here"
], ],