1.提交内容
git pull origin feature-git
git add .
git commit -m 'bugfix'
git push origin feature-git
2.拉取新的分支
git checkout -b feature-gift
git pull origin feature-gift
3.查询当前分支的状态
git status
4.
git rebase --abort
git merge
5.
a.新建分支，跟踪远程分支
git checkout -b advanceView
b.跟踪远程分支
git branch --set-upstream-to=origin/advanceView
c.merge分支
git merge --no-ff advanceView