mirrors/git-flight-rules
mirrors
/
git-flight-rules
mirror of https://github.com/k88hudson/git-flight-rules.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Be more specific about HEAD^ vs HEAD~ (#122) 

* Be more specific about HEAD^ vs HEAD~

* add more

* revise again
This commit is contained in:
Tatsujinichi 2017-11-15 23:08:04 +09:00 committed by Richard Littauer
parent b244c00a4e
commit b838720631
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -383,7 +383,13 @@ Reset the branch master to the previous commit:
(master)$ git reset --hard HEAD^
```
`HEAD^` is short for `HEAD^1`. You can reset further through the generations by specifying which `HEAD` to set to.
`HEAD^` is short for `HEAD^1`. This stands for the first parent of `HEAD`, similarly `HEAD^2` stands for the
second parent of the commit (merges can have 2 parents).
Note that `HEAD^2` is **not** the same as `HEAD~2`
(see [this link](http://www.paulboxley.com/blog/2011/06/git-caret-and-tilde) for more information).
Alternatively, if you don't want to use `HEAD^`, find out what the commit hash you want to set your master branch to (`git log` should do the trick). Then reset to that hash. `git push` will make sure that this change is reflected on your remote.