From: Jeff King <peff@peff.net>
Date: Tue, 26 Dec 2006 07:33:49 GMT
Subject: Re: confusion over the new branch and merge config
Message-ID: <20061226073346.GA22218@segfault.peff.net>
In-Reply-To: <Pine.LNX.4.64.0612241544250.18171@xanadu.home>

On Sun, Dec 24, 2006 at 03:49:50PM -0500, Nicolas Pitre wrote:

> What would be nice as well is to be able to provide only the _name_ of 
> the tracking branch without the refs/remotes/$origin/ prefix.  Since 
> there is already a 'branch."blah".remote = $origin' entry, then having 
> 'branch."blah".merge = $foo' could mean "refs/remotes/$origin/$foo" when 
> $foo contains no slash.

NAK. That makes branch names like "jc/foo" second-class citizens. You
would do better to say "entries without refs/ are implicitly local refs
in refs/remotes/".

-Peff