1、git merge 和 git rebase
https://blog.csdn.net/wh_19910525/article/details/7554489
http://gitbook.liuhui998.com/4_2.html
2、git commit -m 与 git commit -am 的区别
https://segmentfault.com/q/1010000005900988
3、git pull和git pull --rebase
https://www.cnblogs.com/kevingrace/p/5896706.html
4、比较好的Git教程
http://gitref.justjavac.com/inspect/#log
https://www.liaoxuefeng.com/wiki/0013739516305929606dd18361248578c67b8067c8c017b000