From: Santi Béjar Date: Wed, 03 Jan 2007 00:24:33 GMT Subject: Re: confusion over the new branch and merge config Message-ID: <8aa486160701021624v69015fbibb81a99177dd7dfc@mail.gmail.com> In-Reply-To: On 1/2/07, Jakub Narebski wrote: > 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... Currently it does not work. Santi