* 查看分支
git branch
* 更新
git pull
* 切换到master分支
git checkout master
Checking out files: 100% (907/907), done.
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
* 其他分支合并到master
git merge 20180723_dev_xdr_v2
* publish local commits
git push
Counting objects: 14, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (14/14), 1.33 KiB | 683.00 KiB/s, done.
Total 14 (delta 8), reused 0 (delta 0)
remote: Resolving deltas: 100% (8/8)
remote: Updating references: 100% (1/1)
To http://xxxxxxx/r/ENSO/webapp.git
8eb85962..dc25f7d2 master -> master
* 查看状态
