From: Kevin <ikke@ikke.info>
To: Ross Boylan <ross@biostat.ucsf.edu>
Cc: git <git@vger.kernel.org>
Subject: Re: confused about remote branch management
Date: Wed, 23 Jul 2014 15:30:32 +0200 [thread overview]
Message-ID: <CAO54GHDC1rA9hNcAHw0dTcm7Ynu=QRacmnsP9ub09qSP_8NAEg@mail.gmail.com> (raw)
In-Reply-To: <1406083743.29001.139.camel@localhost>
On Jul 23, 2014 5:11 AM, "Ross Boylan" <ross@biostat.ucsf.edu> wrote:
>
> My local master branch is the result of a merge of upstream master and
> some local changes. I want to merge in more recent upstream work.
> git pull doesn't seem to have updated origin/master, and git checkout
> origin/master also doesn't seem to work.
>
git pull with two parameters in older versions will not update remote
tracking branches. That's because the last parameter expects a refspec
with a source and destination and you only specify a source.
Doing a git fetch will update them.
> ross@tempserver:~/UCSF/Choi/GitHub/ESS$ git --version
> git version 1.7.10.4
Version 1.8.4 changes this behavior and will update the remote
tracking branches.
next prev parent reply other threads:[~2014-07-23 13:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 2:49 confused about remote branch management Ross Boylan
2014-07-23 7:40 ` Chris Packham
2014-07-23 19:22 ` Ross Boylan
2014-07-23 21:41 ` Junio C Hamano
2014-07-23 23:30 ` Ross Boylan
2014-07-23 23:51 ` Junio C Hamano
2014-07-24 0:24 ` Ross Boylan
2014-07-23 13:30 ` Kevin [this message]
[not found] ` <CAO54GHBEexASvZcdJqDtgYkfecGbuZFLneC6Nr8u6CYfXuUPog@mail.gmail.com>
2014-07-23 18:54 ` Ross Boylan
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='CAO54GHDC1rA9hNcAHw0dTcm7Ynu=QRacmnsP9ub09qSP_8NAEg@mail.gmail.com' \
--to=ikke@ikke.info \
--cc=git@vger.kernel.org \
--cc=ross@biostat.ucsf.edu \
/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).