git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Convissor <danielc@analysisandsolutions.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: config for merging master to test branch
Date: Tue, 29 Dec 2009 12:56:08 -0500	[thread overview]
Message-ID: <20091229175607.GA3683@panix.com> (raw)
In-Reply-To: <7vvdfphgbu.fsf@alter.siamese.dyndns.org>

Hi Junio:

> Good.  That is how it was designed to be used ;-)

Thanks for the reassurance.


>     [branch "test"]
>         remote = origin
>         merge = refs/heads/master
> 
>     When on branch "test", "pull" and "fetch" by default interact with the
>     "origin" repository, and "pull" integrates what was found on the
>     'master' branch from that remote into your history.

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".

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

Thanks,

--Dan

-- 
 T H E   A N A L Y S I S   A N D   S O L U T I O N S   C O M P A N Y
            data intensive web and database programming
                http://www.AnalysisAndSolutions.com/
 4015 7th Ave #4, Brooklyn NY 11232  v: 718-854-0335 f: 718-854-0409

  reply	other threads:[~2009-12-29 17:56 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-28 23:38 config for merging master to test branch Daniel Convissor
2009-12-29 16:43 ` Daniel Convissor
2009-12-29 16:53   ` Junio C Hamano
2009-12-29 17:56     ` Daniel Convissor [this message]
2009-12-29 18:32       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20091229175607.GA3683@panix.com \
    --to=danielc@analysisandsolutions.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).