Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-03 Thread Philip Oakley
On 03/03/13 11:26, Thomas Ferris Nicolaisen wrote: The confusion there would be public vs private branches (never publish to a public branch that _will_ be used by team mates). But I would still expect that individual developers would need to fixup and rework their private branch

Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-03 Thread Thomas Ferris Nicolaisen
The confusion there would be public vs private branches (never publish > to a public branch that _will_ be used by team mates). But I would still > expect that individual developers would need to fixup and rework their > private branches before publishing to a public branch. And if they have >

Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-02 Thread Philip Oakley
On 02/03/13 12:08, Thomas Ferris Nicolaisen wrote: On Saturday, March 2, 2013 12:23:07 AM UTC+1, Philip Oakley wrote: From: "Philip Oakley" > Sent: Friday, March 01, 2013 10:36 PM >I have two PCs, one running Windows Msysgit & Git for Windows, which >I'm familiar with, and the

Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-02 Thread Thomas Ferris Nicolaisen
On Saturday, March 2, 2013 12:23:07 AM UTC+1, Philip Oakley wrote: > From: "Philip Oakley" > > Sent: Friday, March 01, 2013 10:36 PM > >I have two PCs, one running Windows Msysgit & Git for Windows, which > >I'm familiar with, and the other a laptop with Ubuntu (still not > >familiar). I have

Re: [git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-01 Thread Philip Oakley
From: "Philip Oakley" Sent: Friday, March 01, 2013 10:36 PM I have two PCs, one running Windows Msysgit & Git for Windows, which I'm familiar with, and the other a laptop with Ubuntu (still not familiar). I have a repo hosted on GitHub. I rebased a branch on my windows PC and pushed it to Git

[git-users] fetching a branch I rebased - how to update the local branch on machine 2.

2013-03-01 Thread Philip Oakley
I have two PCs, one running Windows Msysgit & Git for Windows, which I'm familiar with, and the other a laptop with Ubuntu (still not familiar). I have a repo hosted on GitHub. I rebased a branch on my windows PC and pushed it to Github with a forced update. I've now fetched the branch to my