- blob
- tree
- commit
- tag
HEAD means the newly commit of current branch
HEAD~1
HEAD~2
HEAD~3
HEAD^
HEAD~1^1
HEAD~1^2
Common Usage:
A:
$ git commit -a -m 'Push Temp'
$ git pull --rebase origin master
# Fix Conflict
$ git reset HEAD~1
B:
$ git stash --include-untracked
$ git pull --rebase origin master
$ git stash pop
# Fix Conflict & merge
C:
git merge-file
http://git-scm.com/docs/git-merge-file
Tutorial on Git / 白話文Git教學http://thoy.blog.ntu.edu.tw/2011/05/01/tutorial-on-git-%E7%99%BD%E8%A9%B1%E6%96%87git%E6%95%99%E5%AD%B8/
Git Tutorial 教學
http://www.slideshare.net/ihower/git-tutorial-13695342
寫給大家的Git教學
http://www.slideshare.net/littlebtc/git-5528339
