Re: Implementing branch attributes in git config

From: Jakub Narebski <jnareb@gmail.com>
Date: May 11, 2006, 06:02 UTC
Message-ID: <e3uk0u$14n$1@sea.gmane.org>
In-Reply-To: <Pine.LNX.4.64.0605102148310.24505@localhost.localdomain>

Nicolas Pitre wrote:

Show 10 quoted lines

> On Wed, 10 May 2006, Linus Torvalds wrote:
> 
>> [branch "origin"]
>> remote = git://git.kernel.org/pub/scm/git/git.git
>> branch master
> 
> I totally agree with the principle, but I find the above really
> confusing.  Which "branch" means what?  At least if it was "remote_url"
> and "remote_branch" then there wouldn't be any possibility for
> confusion.

I'm not sure if remotes shortcuts and configuration (which branches should be pulled, and to which branches) should be in branches configuration. It is somewhat confusing. Branches configuration might be used for default pulling, e.g.

[remote "kernel.org"]
        url = git://git.kernel.org/pub/scm/git/git.git
        pull = master:origin
        ...
        pull = +pu:pu

[branch "origin"]
        pull = kernel.org
        readonly

[branch "pu"]
        pull = kernel.org
        readonly
        fast-forward = no

-- 
Jakub Narebski
Warsaw, Poland