From: Jakub Narebski <jnareb@gmail.com>
Date: Tue, 02 Jan 2007 20:30:21 GMT
Subject: Re: confusion over the new branch and merge config
Message-ID: <enef73$467$1@sea.gmane.org>
In-Reply-To: <7v1wmdure6.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

> Obviously, the local names should matter more when you are doing
> local operations.  So if you are using mergeLocal to give a
> shorthand to "git merge" that does not explicitly say what to
> merge, the above discussion does not apply.  But if that is the
> case, mergeLocal should also not affect the selection of
> branches to be merged when "git pull" happens from a remote
> either.

You can always use remote = ".", and then remote and local branches
are the same...
-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git