git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: config for merging master to test branch

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 29, 2009, 18:32 UTC
Message-ID
<7vskatd418.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20091229175607.GA3683@panix.com>
Daniel Convissor <danielc@analysisandsolutions.com> writes:
Show 7 quoted lines
> 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").

Previous: Daniel Convissor
Message 5 of 5 in “config for merging master to test branch”
  1. Daniel ConvissorDec 28, 2009
  2. Daniel ConvissorDec 29, 2009
  3. Junio C HamanoDec 29, 2009
  4. Daniel ConvissorDec 29, 2009
  5. Junio C HamanoDec 29, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.