http://git-scm.com/2011/07/11/reset.html
[user]
name = Peter Wang
email = happypeter1983@gmail.com
[core]
editor = vim
[alias]
ci = commit -a -v
co = checkout
st = status
br = branch
throw = reset --hard HEAD
throwh = reset --hard HEAD^
[color]
ui = true
[push]
default = current
git reset --soft HEAD^
# edit edit edit
git commit -a -c ORIG_HEAD
当然也可以使用 git commit --amend
http://blog.hashrocket.com/posts/feature-development-with-git-branching