pull/push from multiple remote locations
The short: is there a way to have a git repo push to and pull from a list of remote repos (rather than a single "origin")?
The long: I often have a situation when I'm developing an app in multiple computers, with different connectivity -- say a laptop while on transit, a computer "A" while I'm in a certain location, and another computer "B" while on another. Also, the laptop might have connectivity with only either "A" or "B", and sometimes both.
What I would like to is for git to always "pull" from and "push" to all the computers it can currently connect to, so it's easier to jump from one machine to the other and continue working seamlessly.
You can configure multiple remote repositories with the git remote command:
git remote add alt alt-machine:/path/to/repo
To fetch from all the configured remotes and update tracking branches, but not merge into HEAD, do:
git remote update
If it's not currently connected to one of the remotes, it will take time out or throw an error, and go on to the next. You'll have to manually merge from the fetched repositories, or cherry-pick, depending on how you want to organize collecting changes.
To fetch the master branch from alt and pull it into your current head, do:
git pull alt master
So in fact git pull is almost shorthand for git pull origin HEAD (actually it looks in the config file to determine this, but you get the idea).
For pushing updates, you have to do that to each repo manually. A push was, I think, designed with the central-repository workflow in mind.
Doing this manually is no longer necessary , with modern versions of git ! See Malvineous 's solution, below.
Reproduced here:
git remote set-url origin --push --add <a remote>
git remote set-url origin --push --add <another remote>
Original answer:
This something I've been using for quite a while without bad consequences and suggested by Linus Torvalds on the git mailing list.
araqnid ’s solution is the proper one for bringing code into your repository… but when you, like me, have multiple equivalent authoritative upstreams (I keep some of my more critical projects cloned to both a private upstream, GitHub, and Codaset), it can be a pain to push changes to each one, every day.
Long story short, git remote add all of your remotes individually… and then git config -e and add a merged‐remote. Assuming you have this repository config :
[remote "GitHub"]
url = git@github.com:elliottcable/Paws.o.git
fetch = +refs/heads/*:refs/remotes/GitHub/*
[branch "Master"]
remote = GitHub
merge = refs/heads/Master
[remote "Codaset"]
url = git@codaset.com:elliottcable/paws-o.git
fetch = +refs/heads/*:refs/remotes/Codaset/*
[remote "Paws"]
url = git@github.com:Paws/Paws.o.git
fetch = +refs/heads/*:refs/remotes/Paws/*
… to create a merged‐remote for "Paws" and "Codaset" , I can add the following after all of those:
[remote "Origin"]
url = git@github.com:Paws/Paws.o.git
url = git@codaset.com:elliottcable/paws-o.git
Once I've done this, when I git push Origin Master , it will push to both Paws/Master and Codaset/Master sequentially, making life a little easier.
The latest version of git (as of October 2012) allows you to do this from the command line:
git remote set-url origin --push --add user1@repo1
git remote set-url origin --push --add user2@repo2
git remote -v
Then git push will push to user1@repo1, then push to user2@repo2. Leave out --push if you also want to be able to git pull from them too.
上一篇: 将代码推送到两个遥控器
下一篇: 从多个远程位置拉/推