问题
In a Udacity lesson covering relative commit references, it says:
^ indicates the parent commit, ~ indicates the first parent commit
The main difference between the ^ and the ~ is when a commit is created from a merge. A merge commit has two parents. With a merge commit, the ^ reference is used to indicate the first parent of the commit while ^2 indicates the second parent. The first parent is the branch you were on when you ran git merge while the second parent is the branch that was merged in.
According to the lesson, based on the following output of git log --graph --oneline, the commit with SHA f69811c is HEAD~4^2 relative to the (topmost, with the head pointer) commit 9ec05ca.
So HEAD~4 on its own means the first parent, while ^2 means it's also the second parent? Don't these things contradict each other? Any clarification appreciated.
回答1:
X~n means: The nth ancestor of X.
X^ means: The parent of X. This is equivalent to X~1.
If X has more than one parent, one needs to distinguish between them when using the ^ notation. So X^1 would be the first parent, X^2 would be the second parent, and so on. X^ is equivalent to X^1 (and also equivalent to X~1).
In your example, starting from commit 9ec05ca, which is HEAD:
db7e87aisHEAD~1(or alternativelyHEAD^).796ddb0isHEAD~2(or alternativelyHEAD^^).1a56a81isHEAD~4(or alternativelyHEAD^^^^, but nobody would use that).e014d91, being the first parent of1a56a81, isHEAD~5, orHEAD~4^, orHEAD~4^1.f69811c, being the second parent of1a56a81, isHEAD~4^2.
Reference
https://git-scm.com/docs/gitrevisions
回答2:
It's not totally wrong, but it's a bit too short: since the "~" operator is performing a depth search (nth ancestor, which actually corresponds to the nth last commit on a single branch), its argument can't specify a parent if they are many of them. It hence assumes it should always follow the first one of them. This correlates with your other question, where we were discussing about parent order.
来源：https://stackoverflow.com/questions/50438607/head42-meaning