git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geoff Russell <geoffrey.russell@gmail.com>
To: Bradley Wagner <bradley.wagner@hannonhill.com>
Cc: git@vger.kernel.org
Subject: Re: git pull question
Date: Mon, 26 Jul 2010 13:21:01 +0930	[thread overview]
Message-ID: <AANLkTikpspDiUf==vCUiBqnQKFgcbag8XXaNYK3COjQu@mail.gmail.com> (raw)
In-Reply-To: <AANLkTi=wXGBMUekUhtHS1KCOhjgac3ET8rmSCwUPHzQ3@mail.gmail.com>

On Mon, Jul 26, 2010 at 1:13 PM, Bradley Wagner
<bradley.wagner@hannonhill.com> wrote:
>> ...
>> $ git checkout master
>> $ git pull origin refs/heads/brA:brA
>>
>> The pull here seems to update both the current branch as well as brA?
>> Is this intentional?
>
> I believe this is intentional.
>
> A git pull always pulls into (at least) the currently checked out
> branch, in your case "master". By adding the <dst> param after the
> colon in the <refspec> you're saying to go ahead and fast-forward
> merge the local branch called "brA" if possible.

Okay.


> However, I'm not entirely clear myself on the meaning of this note in
> the documentation:
>
> Note
> You never do your own development on branches that appear on the right
> hand side of a <refspec> colon on Pull: lines; they are to be updated
> by git fetch. If you intend to do development derived from a remote
> branch B, have a Pull: line to track it (i.e.  Pull: B:remote-B), and
> have a separate branch my-B to do your development on top of it. The
> latter is created by git branch my-B remote-B (or its equivalent git
> checkout -b my-B remote-B). Run git fetch to keep track of the
> progress of the remote side, and when you see something new on the
> remote branch, merge it into your development branch with git pull .
> remote-B, while you are on my-B branch.

Yes, I was wondering about this ... I can't see any downside


Geoff.

      reply	other threads:[~2010-07-26  3:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-26  1:56 git pull question Geoff Russell
2010-07-26  3:43 ` Bradley Wagner
2010-07-26  3:51   ` Geoff Russell [this message]

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='AANLkTikpspDiUf==vCUiBqnQKFgcbag8XXaNYK3COjQu@mail.gmail.com' \
    --to=geoffrey.russell@gmail.com \
    --cc=bradley.wagner@hannonhill.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).