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