On Jul 23, 2014 5:11 AM, "Ross Boylan" <r...@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 18.104.22.168
Version 1.8.4 changes this behavior and will update the remote
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html