Re: confused about remote branch management

2014-07-23 Thread Ross Boylan
On Wed, 2014-07-23 at 16:51 -0700, Junio C Hamano wrote: > Ross Boylan writes: > > >> Either > >> > >>git fetch origin master:refs/remotes/origin/master > > Great; that works. > > Is that procedure supposed to be the usual way I track upstream in this > > (1.7) version of git? It seems arca

Re: confused about remote branch management

2014-07-23 Thread Junio C Hamano
Ross Boylan writes: >> Either >> >> git fetch origin master:refs/remotes/origin/master > Great; that works. > Is that procedure supposed to be the usual way I track upstream in this > (1.7) version of git? It seems arcane. No, and no. The command is designed so that most of the time you

Re: confused about remote branch management

2014-07-23 Thread Ross Boylan
On Wed, 2014-07-23 at 14:41 -0700, Junio C Hamano wrote: > Ross Boylan writes: > > > I still don't know what I need to do to update origin/master in my local > > repo. > > > > Regarding Kevin's suggestion, I just tried "git fetch origin master". > > I think Kevin's suggestion was 'To older git,

Re: confused about remote branch management

2014-07-23 Thread Junio C Hamano
Ross Boylan writes: > I still don't know what I need to do to update origin/master in my local > repo. > > Regarding Kevin's suggestion, I just tried "git fetch origin master". I think Kevin's suggestion was 'To older git, "git fetch origin master" tells it to fetch master without updating origi

Re: confused about remote branch management

2014-07-23 Thread Ross Boylan
I still don't know what I need to do to update origin/master in my local repo. Regarding Kevin's suggestion, I just tried "git fetch origin master". It seems to have made no difference, at least judging by git show origin/master. I'm assuming the commit it show is the head of the branch. For re

Re: confused about remote branch management

2014-07-23 Thread Ross Boylan
On Wed, 2014-07-23 at 15:09 +0200, Kevin wrote: > > On Jul 23, 2014 5:11 AM, "Ross Boylan" 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 origi

Re: confused about remote branch management

2014-07-23 Thread Kevin
On Jul 23, 2014 5:11 AM, "Ross Boylan" 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

Re: confused about remote branch management

2014-07-23 Thread Chris Packham
On 23/07/14 14:49, Ross Boylan 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. > >

confused about remote branch management

2014-07-22 Thread Ross Boylan
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. Here's some info that may be relevant. ross@tem