From: Junio C Hamano <junkio@cox.net>
Date: Sat, 23 Dec 2006 06:15:15 GMT
Subject: Re: confusion over the new branch and merge config
Message-ID: <7vbqlvuoi4.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20061223051210.GA29814@segfault.peff.net>

Jeff King <peff@peff.net> writes:

> BTW, is there some explanation why branch.*.merge specifies a _remote_
> head? The following would make much more sense to me:
>
> [branch "master"]
> remote = origin
> merge = refs/remotes/origin/master

Only *if* you store it in that tracking branch.  The name the
other party gives _do_ matter to you anyway, because you have to
_know_ it to fetch.  What it does NOT matter is if you use a
tracking branch, or if you do, which local tracking branch you
use to track it.