From: Nicolas Pitre Date: Sat, 23 Dec 2006 05:29:57 GMT Subject: Re: confusion over the new branch and merge config Message-ID: In-Reply-To: <20061223051210.GA29814@segfault.peff.net> On Sat, 23 Dec 2006, Jeff King wrote: > 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 > > Because I don't _care_ that the other guy calls it refs/heads/master. I > care that I'm pulling from refs/remotes/origin/master on my end (and > however I get stuff into that branch is defined by the remote). Exactly the point I'm trying to make ! I'm glad I'm not alone to come to this conclusion. Nicolas