查看分支: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
查看分支: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
转载于:https://www.cnblogs.com/413xiaol/p/6810549.html