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

[git-users] Re: Problem cloning a GIT repo, Out of memory, windows XP (32-bit)

2013-03-02 Thread Thomas Ferris Nicolaisen
On Friday, March 1, 2013 1:17:49 PM UTC+1, Igor Kazarnovskiy wrote: > Morning :) > > I have a problem cloning a large GIT repository on a windows XP (32-bit) > machine. The output looks as follows: > > $ git clone ssh://user@server/.../git/repo/myrepo mylocalrepo > Cloning into 'mylocalrepo'... >

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

[git-users] basic queries on branching & merging in Git

2013-03-02 Thread Surya
I am working of a project "X" I created a branch "b1" from "master". I am working on some improvements in "b1". I didn't commit anything. Not even stage! In the middle of the story, I found another bug need to be address soon. So, I thought to create another branch "b2" from Master and work on

Re: [git-users] basic queries on branching & merging in Git

2013-03-02 Thread Rahmat Budiharso
the stash command is your friends, basically before you switch to master from b1, you do a git stash: (on b1) $ git stash save -u this will save all your untracked and unstaged file in b1 in a stash, after that you'll be back in a state just like you were when you first branch off of master, n