刷新本地分支
首先查看一下本地分支的状态，最新的一条记录是减少了b.txt文件[root@supman git]# git branch -avv* master 3608563 [origin/master] add b.txt. remotes/origin/master 3608563 add b.txt.而后咱们在另外分支，或者间接在gitee仓库中改变一下仓库中的内容，应用 git fetch命令刷新本地分支，看一下分支状态，会发现有新的变动[root@supman git]# git fetchremote: Enumerating objects: 4, done.remote: Counting objects: 100% (4/4), done.remote: Compressing objects: 100% (2/2), done.remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0Unpacking objects: 100% (3/3), done.来自 https://gitee.com/codeyuany/git 3608563..cbf22f8 master -> origin/master[root@supman git]# git branch -avv* master 3608563 [origin/master：落后 1] add b.txt. remotes/origin/master cbf22f8 add c.txt.[root@supman git]# 应用
git merge或者git rebase命令能够把近程仓库中的内容合并到本地，其实git fetch + git merge恰好等同于之前用过的git pull
git merge除了能够合并近程分支，也能够用于本地分支和本地分支之间的合并
[root@supman git]# git merge origin/master更新 3608563..cbf22f8Fast-forward c.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 c.txt[root@supman git]# git branch -avv* master cbf22f8 [origin/master] add c.txt. remotes/origin/master cbf22f8 add c.txt.创立分支
能够应用git branch命令查看一下以后的分支。[root@supman git]# git branch* master而后咱们用git branch + 分支名的形式来创立一条新的分支，并查看一下有哪些分支。[root@supman git]# git branch dev[root@supman git]# git branch -a dev* master remotes/origin/master应用git checkout + 分支名称来切换分支，并且查看分支 带*的代表以后分支
[root@supman git]# git checkout dev切换到分支 'dev'[root@supman git]# git branch * dev master应用git push + 主机名 + 本地分支名称:近程分支名称将本地分支推送到近程服务器[root@supman git]# git push origin dev:devUsername for 'https://gitee.com': codeyuanyPassword for 'https://codeyuany@gitee.com': Total 0 (delta 0), reused 0 (delta 0)remote: Powered by GITEE.COM [GNK-6.1]remote: Create a pull request for 'dev' on Gitee by visiting:remote: https://gitee.com/codeyuany/git/pull/new/codeyuany:dev...codeyuany:masterTo https://gitee.com/codeyuany/git.git * [new branch] dev -> dev[root@supman git]# git branch -a* dev master remotes/origin/dev remotes/origin/master把近程分支更新到本地
[root@supman git]# git pull origin dev来自 https://gitee.com/codeyuany/git * branch dev -> FETCH_HEAD更新 cbf22f8..107c861Fast-forward c.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)能够让本地分支追踪近程分支，就是将本地分支和近程分支相关联
[root@supman git]# git branch -u origin/dev dev分支 dev 设置为跟踪来自 origin 的近程分支 dev。[root@supman git]# git pullAlready up-to-date.删除分支
git push 主机名 --delete 分支名删除近程分支 、git branch -d dev删除本地分支
[root@supman git]# git push origin --delete devUsername for 'https://gitee.com': codeyuanyPassword for 'https://codeyuany@gitee.com': remote: Powered by GITEE.COM [GNK-6.1]To https://gitee.com/codeyuany/git.git - [deleted] dev[root@supman git]# git branch -a* dev master remotes/origin/master[root@supman git]# git branch -d deverror: 无奈删除您以后所在的分支 'dev'。