拉取master分支
git clone https://gitee.com/dyyx/gitdemo.git 

拉取 dev3 分支
git clone https://gitee.com/dyyx/gitdemo.git  -b dev3

git clone https://gitee.com/dyyx/gitdemo.git 
cd gitdemo
git branch
* master

查看本地分支关联的远程分支
git branch -vv
* master ab9a1d5 [origin/master] update

查看所有分支
git branch -a

* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/dev2
  remotes/origin/dev3
  remotes/origin/develop
  remotes/origin/master
  
切换远程分支
git checkout -b 本地分支名  远程分支名
注意远程分支名 一定要带 origin/ 前缀 

git checkout -b dev3  origin/dev3
Branch 'dev3' set up to track remote branch 'dev3' from 'origin'.
Switched to a new branch 'dev3'

查看本地分支
git branch  

查看远程分支
git branch -r

查看所有分支
git branch -a
* dev3
  master
  remotes/origin/HEAD -> origin/master
  remotes/origin/dev2
  remotes/origin/dev3
  remotes/origin/develop
  remotes/origin/master
  

带星的是当前分支
远程分支 remotes/origin/ 开头  且红色显示
  
git branch -vv
* dev3   1455810 [origin/dev3] add dev3.txt
  master ab9a1d5 [origin/master] update
  
切换本地分支
git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.

git branch -vv

  dev3   1455810 [origin/dev3] add dev3.txt
* master ab9a1d5 [origin/master] update


删除本地分支  
git branch -d xxx




分支合并
git merge  branch-name



git grep  keyword  
搜索含有关键词的文件 


git blame  filename  
查看指定文件每一行的提交人和提交时间 


git log -p filename
查看指定文件的变更和提交历史



 git冲突合并及强制推送  
 git合并处理