git merge的三种操作merge, squash merge, 和rebase merge