From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Dec 2009 18:32:51 GMT
Subject: Re: config for merging master to test branch
Message-ID: <7vskatd418.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20091229175607.GA3683@panix.com>

Daniel Convissor <danielc@analysisandsolutions.com> writes:

> Excellent.  Initially, I wasn't sure what the following commands did:
>
>    git config branch.test.remote origin
>    git config branch.test.merge refs/heads/master
>
> Between further reading and your explanation I now understand it better. 
> "refs/heads/master" refers items displayed by "git show-ref".

Not quite.  refs/heads/master there refers to the _local_ master branch,
but it is _local_ with respect to the origin repository, not your
repository.  "git show-ref" is about showing refs in _your_ repository.

> So what is "refs/remotes/origin/master", please?

    http://gitster.livejournal.com/30313.html

If you read Japanese, you may also want to read Ch.13 of my book ;-)

The refs/remotes/ hierarchy is used to store a copy of the branch tips
fetched from the named remotes (like "origin").