命令
- 查看所有分支:本地和远程
git branch -a
- 设置本地分支与远程分支的追踪:
git branch --set-upstream-to=origin/远程分支名 本地分支名
//或
git branch --set-upstream 远程分支名
//或
git branch -u 远程分支名
- 查看本地分支与远程分支的追踪:
git branch -vv
测试:
- 查询本地和远程分支
D:\Users\able\AndroidStudioProjects\MyApplication>git branch -a
* master
upstream
remotes/github/master
remotes/upstream/master
可看到所有仓库,包含本地和远程
- 查看本地分支与远程分支的追踪:
D:\Users\able\AndroidStudioProjects\MyApplication>git branch -vv
* master 15d9aec [upstream/master: ahead 1, behind 1]
<E5><86><8D><E5><8A><A0><E4><BA><86><E4><B8><AA><E6><96><87><E4><BB><B6>
upstream 15fca10 [upstream/master] initial
可看到本地分支master对应的远程分支upstream/master的追踪
Android studio中打开以下,可看到【默认】的pull就是upstream/master的远程分支
- 设置本地分支与远程分支remotes/github/master的追踪:
D:\Users\able\AndroidStudioProjects\MyApplication>git branch -u remotes/github/master
Branch 'master' set up to track remote branch 'master' from 'github'.
将本地master分支追踪远程分支github/master
- 再次查看本地分支与远程分支的追踪:
D:\Users\able\AndroidStudioProjects\MyApplication>git branch -vv
* master 15d9aec [github/master: ahead 1]
<E5><86><8D><E5><8A><A0><E4><BA><86><E4><B8><AA><E6><96><87><E4><BB><B6>
upstream 15fca10 [upstream/master] initial
可看到本地分支master对应的远程分支github/master的追踪
Android studio中打开以下,可看到【默认】的pull就是github/master的远程分支
- 设置本地分支与远程分支remotes/upstream/master的追踪:
D:\Users\able\AndroidStudioProjects\MyApplication>git branch -u remotes/upstream/master
Branch 'master' set up to track remote branch 'master' from 'upstream'.
将本地master分支追踪远程分支upstream/master
- 再次查看本地分支与远程分支的追踪:
D:\Users\able\AndroidStudioProjects\MyApplication>git branch -vv
* master 15d9aec [upstream/master: ahead 1, behind 1]
<E5><86><8D><E5><8A><A0><E4><BA><86><E4><B8><AA><E6><96><87><E4><BB><B6>
upstream 15fca10 [upstream/master] initial
可看到本地分支master对应的远程分支upstream/master的追踪