git分支操作小记

查看本地分支：git branch
查看远程分支：git branch -r
创建本地分支：git branch branchname
切换分支：git checkout branchname
创建并切换切换分支：git checkout -b branchname
删除分支：git branch -d branchname 未合并的分支无法删除，-D强制删除分支
合并分支：git merge branchname 将branchname合并到当前分支
创建远程分支：git branch origin branchname
拉取远程分支：git checkout -b branchname  remotebranch
推送远程分支：git push origin branchname1:branchname2; branch1为本地分支branch2为远程分支
删除远程分支：git push origin :test

创建基于某个分支的分支：git branch newbranch basebranch

创建并切换基于某个分支的分支：git checkout -b newbranch basebranch

分支合并分为3种：

      直接合并：git merge branchname

      压缩合并：git merge --squash branchname, git commit -m"xxxx"

      拣选合并：git cherry-pick xxx(commit的sha1值)；git cherry-pick -n xxx，这样就不会自动commit了

 分支重命名：git branch -m oldbranch newbranch