Re: confusion over the new branch and merge config

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