* Many different remote branch sources
@ 2007-03-02 10:53 Alex Riesen
2007-03-02 15:47 ` Johannes Schindelin
0 siblings, 1 reply; 3+ messages in thread
From: Alex Riesen @ 2007-03-02 10:53 UTC (permalink / raw)
To: Git Mailing List
The following does not seem to work:
[remote "dev1"]
url = ...
fetch = ...
[remote "dev2"]
url = ...
fetch = ...
[branch "integration"]
remote = dev1
merge = refs/heads/topic1
[branch "integration"]
remote = dev2
merge = refs/heads/topic2
How can I specify that a branch has more then one
remote branch it can be merged with?
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Many different remote branch sources
2007-03-02 10:53 Many different remote branch sources Alex Riesen
@ 2007-03-02 15:47 ` Johannes Schindelin
2007-03-02 22:18 ` Alex Riesen
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Schindelin @ 2007-03-02 15:47 UTC (permalink / raw)
To: Alex Riesen; +Cc: Git Mailing List
Hi,
On Fri, 2 Mar 2007, Alex Riesen wrote:
> The following does not seem to work:
>
> [remote "dev1"]
> url = ...
> fetch = ...
> [remote "dev2"]
> url = ...
> fetch = ...
>
> [branch "integration"]
> remote = dev1
> merge = refs/heads/topic1
>
> [branch "integration"]
> remote = dev2
> merge = refs/heads/topic2
>
> How can I specify that a branch has more then one
> remote branch it can be merged with?
The branch.<branchname> information is purely for determining what you
want to do when saying "git pull" (without other arguments).
In your case, I'd strongly advise against using this construct, since you
don't want to merge with dev1 and dev2 _at the same time_.
Rather, add a "fetch = refs/heads/topic1" at the _top_ of the remotes.dev1
section, and say "git pull dev1" when you want to pull from dev1.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Many different remote branch sources
2007-03-02 15:47 ` Johannes Schindelin
@ 2007-03-02 22:18 ` Alex Riesen
0 siblings, 0 replies; 3+ messages in thread
From: Alex Riesen @ 2007-03-02 22:18 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Git Mailing List
On 3/2/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> Rather, add a "fetch = refs/heads/topic1" at the _top_ of the remotes.dev1
> section, and say "git pull dev1" when you want to pull from dev1.
This is exactly what I wanted. I just somehow believed that
git pull uses only references configured in branch sections,
never the references in "remote" sections. Am a bit confused.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-03-02 22:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-02 10:53 Many different remote branch sources Alex Riesen
2007-03-02 15:47 ` Johannes Schindelin
2007-03-02 22:18 ` Alex Riesen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).