Re: [git-users] Unable to pull from remote branch

2012-10-18 Thread Konstantin Khomoutov
On Wed, Oct 17, 2012 at 12:18:10PM -0700, kramer.newsreader wrote: > I did a git log and found this merge: > > commit 5f052c9b72f5f6306ee3702c66b6de701e36b06f > Merge: 8100265 f645170 > Author: ... > Date: Wed Oct 17 12:50:38 2012 -0400 > > Merge remote-tracking branch 'gerrit/master' into

Re: [git-users] Unable to pull from remote branch

2012-10-17 Thread kramer.newsreader
Hmmm. I spoke too soon. It seems that your advice did not really help:( I did a git log and found this merge: commit 5f052c9b72f5f6306ee3702c66b6de701e36b06f Merge: 8100265 f645170 Author: ... Date: Wed Oct 17 12:50:38 2012 -0400 Merge remote-tracking branch 'gerrit/master' into nov2012

Re: [git-users] Unable to pull from remote branch

2012-10-17 Thread kramer.newsreader
Excellent! Thank you! Must have misread the help. On Wednesday, October 17, 2012 2:26:06 PM UTC-4, Alexandru Pătrănescu wrote: > > check the pull command help! > > you could run: > > git fetch origin > git rebase remotes/origin/nov2012 > > > or > > git pull --rebase origin nov2012 > > > > > On W

Re: [git-users] Unable to pull from remote branch

2012-10-17 Thread Alexandru Pătrănescu
check the pull command help! you could run: git fetch origin git rebase remotes/origin/nov2012 or git pull --rebase origin nov2012 On Wed, Oct 17, 2012 at 9:12 PM, kramer.newsreader < kramer.newsrea...@gmail.com> wrote: > Hi guys, > > FYI Git n00b here. > > I am having trouble pulling fro

[git-users] Unable to pull from remote branch

2012-10-17 Thread kramer.newsreader
Hi guys, FYI Git n00b here. I am having trouble pulling from a remote branch. I'm not really sure what's going on. I didn't have any problem with this yesterday. I can manually log in to the remote server (gerrit). See the commands below: $ git branch -a master * nov2012 remotes/gerri