git常用命令二

http://www.jianshu.com/p/08c3f1804b36
http://backlogtool.com/git-guide/cn/stepup/stepup1_1.html

 

git checkout master

git merge other
git cherry-pick <commit id>