From: Kevin <ikke@ikke.info>
Date: Wed, 23 Jul 2014 13:30:32 GMT
Subject: Re: confused about remote branch management
Message-ID: <CAO54GHDC1rA9hNcAHw0dTcm7Ynu=QRacmnsP9ub09qSP_8NAEg@mail.gmail.com>
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.