Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Don't refer to grandparent commit as second parent #78

Merged
merged 1 commit into from

2 participants

@aschrab
Collaborator

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).

@aschrab aschrab 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).
aef97ec
@pcottle pcottle merged commit 8f9986f into pcottle:master
@aschrab aschrab deleted the aschrab:grandparent branch
@pcottle pcottle referenced this pull request from a commit
@pcottle Rebuild for Pull #79 and Pull #78 9f8f015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 20, 2013
  1. @aschrab

    Don't refer to grandparent commit as second parent

    aschrab authored
    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 page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  src/levels/rampup/2.js
View
2  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"
],
Something went wrong with that request. Please try again.