git——branch checkout merge

git branch

desc：查看分支

usage：git branch

git branch name

desc：创建分支

usage：git branch name

git branch -d|-D name

desc：删除分支，-D强行删除

usage：git branch -d|-D name

git checkout name

desc：切换分支

usage：git checkout name

git checkout -b name

desc：创建+切换分支

usage：git checkout -b name

git checkout -- file

desc：discard工作区修改，优先从暂存区恢复，如果暂存区没有，从仓库恢复

usage：git checkout -- file

git merge name

desc：合并分支到当前分支，fast forward merge

usage：git merge name

git merge --no-ff -m comment name

desc：forbid fast forward merge，no fast forward和fast forward的区别在于no fast forward会创建一个新的commit，因此需要-m参数

usage：git merge --no-ff -m comment name

说明

• name：branch name
• file：file name
• comment：comment