From: Nicolas Pitre <nico@cam.org>
Date: Sun, 24 Dec 2006 20:49:50 GMT
Subject: Re: confusion over the new branch and merge config
Message-ID: <Pine.LNX.4.64.0612241544250.18171@xanadu.home>
In-Reply-To: <7vbqlvrldk.fsf@assigned-by-dhcp.cox.net>

On Sat, 23 Dec 2006, Junio C Hamano wrote:

> If you (or other people) use branch.*.merge, with its value set
> to remote name _and_ local name, and actually verify that either
> form works without confusion, please report back and I'll apply.

This is nice, thanks.

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.


Nicolas