查看分支：git branch创建分支：git branch dev重命名分支：git branch -m dev dev1删除分支：git branch -d dev切换分支：git checkout dev合并分支（log中无合并痕迹）：git merge dev合并分支（log中能看到合并痕迹）：git merge dev --no-ff -m 'merge msg'
查看两个分支的差异：git diff master..dev
