git rebase 



git rebase -i HEAD~2
pick # use
edit  #edit
squash # mean this commit will be removed


git rebase master
# 另一种merge, commit history order by date





posted @ 2013-09-02 17:22  lein.wang  Views(95)  Comments(0)  Edit  收藏  举报