merge和rebase https://www.git-tower.com/learn/git/ebook/cn/command-line/advanced-topics/rebase reset和revert https://gitbook.tw/chapters/rewrite-history/reset-revert-and-rebase.html