我有一个存储库(origin
)已经从另一个存储库(upstream
)分叉(用GitHub术语)。我在主题分支中进行所有开发,从不接触上游存储库中存在的分支(master
,developement
,1.x
等。)。
这是我的存储库中分支的示例
$ git branch -a # plus hand annotations
development [upstream-maintained: should always be == upstream/development]
feature-1 [mine: should track origin/feature-1]
feature-2 [mine: should track origin/feature-2]
* master [upstream-maintained: should always be == upstream/master]
remotes/origin/HEAD -> origin/master
remotes/origin/development
remotes/origin/feature-1
remotes/origin/feature-2
remotes/origin/master
remotes/upstream/development
remotes/upstream/gh-pages [I do not care about this..]
remotes/upstream/master
remotes/upstream/stable-1.x [...nor I care about these two..]
remotes/upstream/stable-2.x [...stable-* branches]
从上游存储库获取后,我必须完成更新所有上游维护的分支的繁琐任务:切换到master
,我merge --ff-only upstream/master
并推动原产地。对于我关心的每个上游维护的分支,必须重复此操作。请注意,merge --ff-only
始终有效,因为我从未接触过这些分支。
我希望git pull
为我做这些繁琐的更新。
有没有办法教git上游维护的分支应该推到origin
但是从upstream
拉出和跟踪?
答案 0 :(得分:3)
如“How can I pull from one remote and push to another with git?”中所述,您可以:
确保推送到原点:
git config remote.pushdefault origin
git config push.default matching
设置上游分支:
git fetch upstream
git branch -u upstream/master foo
请注意,您应该在topic
(不合并)之前重新绑定upstream/master
分支,以便在您的请求中没有合并提交。
这意味着git push -f
用于更新fork远程分支(将自动更新pull请求)
您可以通过以下方式强制使用rebase:
git config autosetuprebase remote
# or
git branch.foo.rebase true
例如:
C:\Users\vonc\prog\git\so>git clone https://github.com/gioele/offlineimap.git
Cloning into 'offlineimap'...
remote: Counting objects: 9445, done.
remote: Compressing objects: 100% (3701/3701), done.
remote: Total 9445 (delta 4962), reused 9445 (delta 4962)
Receiving objects: 100% (9445/9445), 5.75 MiB | 2.18 MiB/s, done.
Resolving deltas: 100% (4962/4962), done.
Checking connectivity... done.
C:\Users\vonc\prog\git\so>cd offlineimap
C:\Users\vonc\prog\git\so\offlineimap>git remote add upstream https://github.com/offlineimap/offlineimap.git
让我们看看大师现在指的是什么:
C:\Users\vonc\prog\git\so\offlineimap>git branch -avvv
* master 1746676 [origin/master] Make IDLE mode to work again
remotes/origin/HEAD -> origin/master
C:\Users\vonc\prog\git\so\offlineimap>git config --local -l
remote.origin.url=https://github.com/gioele/offlineimap.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
remote.upstream.url=https://github.com/offlineimap/offlineimap.git
remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/*
让我们将原点作为推送的目的地:
C:\Users\vonc\prog\git\so\offlineimap>git config push.default matching
C:\Users\vonc\prog\git\so\offlineimap>git config remote.pushdefault origin
让我们改变上游分支:
C:\Users\vonc\prog\git\so\offlineimap>git fetch upstream
remote: Counting objects: 55, done.
remote: Compressing objects: 100% (55/55), done.
remote: Total 55 (delta 25), reused 1 (delta 0)
Unpacking objects: 100% (55/55), done.
From https://github.com/offlineimap/offlineimap
* [new branch] master -> upstream/master
C:\Users\vonc\prog\git\so\offlineimap>git branch -u upstream/master master
Branch master set up to track remote branch master from upstream.
master
分支设置为监控upstream/master
:
C:\Users\vonc\prog\git\so\offlineimap>git br -avvv
* master 1746676 [upstream/master: behind 10] Make IDLE mode to work again
现在git pull
(或更好,git pull --rebase
)将从upstream
拉出来:
C:\Users\vonc\prog\git\so\offlineimap>git pull --rebase
First, rewinding head to replay your work on top of it...
Fast-forwarded master to 6bd76fed5a7e1e24310517b3510c465929870c08.
(而6bd76fed5a7e1e24310517b3510c465929870c08
是upstream/master
提交)
git push
仍然会推向原点:
C:\Users\vonc\prog\git\so\offlineimap>git push
remote: Permission to gioele/offlineimap.git denied to VonC.
fatal: unable to access 'https://github.com/gioele/offlineimap.git/': The requested URL returned error: 403
(正常,因为我不是gioele
,我没有对该回购的写入权限)