Git 常用命令整理

分支

本地分支

git branch branchA 创建一个本地分支branchA
git checkout branchA 当前工作空间切换到branchA
git checkout -b branchA 等于上面两个命令合集
git merge branchA 将branchA merge到当前分支
git branch -d branchA 删除分支
git branch –merged / –no-merged 列出已经merge/或者没有merge 到当前分支的分支

远端分支

git push origin branchA 将branchA推到origin远端
git fetch origin 获取远端更新
git checkout -b serverifix origin/serverifix 追踪远端分支
git checkout –track origin/serverifix
git branch -vv 列出本地分支以及其追踪分支
git push origin –delete server fix 删除远端分支

rebasing

git checkout experiment ; git rebase master 将experiment分支rebase到master上
git rebase –onto master server client 将在client而不在server分支的提交rebase到master上

Do not rebase commits that exist outside your repository.