Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Michael
Keep in mind that there was one overall design goal of git: Whenever there was more than one right way to do something, do the opposite of svn. That is not a joke or exaggeration. Branches in git are dirt cheap -- they consist of creating a 40 byte file. "git add" to put stuff into git is moder

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Christopher Jones
Hi, The other thing to realise with git is commits are a lot cheaper, as in the first instance they are only to your local checkout. So if you have a bunch of ’this commit is just so I can save the current state of this branch and switch to another’ commits these can be squashed before you even

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Christopher Jones
Hi, I did the svn->git translation myself at work in the recent past and went through exactly the same things as you are now. Git and Svn are very different in some regards and workflows that worked with svn simply do not with git. The ‘make all changes on master and commit only what I want ea

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Ryan Schmidt
> On Nov 5, 2016, at 3:07 AM, Mojca Miklavec wrote: > > On 5 November 2016 at 08:39, Ryan Schmidt wrote: >> On Nov 4, 2016, at 12:39 AM, David Bariod wrote: >> >>> Personnally, I would just commit such change. It is cheap, can be reworked >>> later and be ketp safe in a private remote reposito

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Mojca Miklavec
On 5 November 2016 at 08:39, Ryan Schmidt wrote: > On Nov 4, 2016, at 12:39 AM, David Bariod wrote: > >> Personnally, I would just commit such change. It is cheap, can be reworked >> later and be ketp safe in a private remote repository in case of disaster. >> With git there are no reason to not c

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Ryan Schmidt
On Nov 4, 2016, at 12:39 AM, David Bariod wrote: > Personnally, I would just commit such change. It is cheap, can be reworked > later and be ketp safe in a private remote repository in case of disaster. > With git there are no reason to not commit event not ready yet change set. Coming from a S

Re: How to keep uncommitted work in a git clone

2016-11-04 Thread Michael
On 2016-11-03, at 10:39 PM, David Bariod wrote: > Hello, > > Personnally, I would just commit such change. It is cheap, can be reworked > later and be ketp safe in a private remote repository in case of disaster. > With git there are no reason to not commit event not ready yet change set. > >

Re: How to keep uncommitted work in a git clone

2016-11-04 Thread David Bariod
On Fri, Nov 4, 2016 at 10:20 AM, Chris Jones wrote: > Hi, > > On 04/11/16 09:16, David Bariod wrote: > >> >> >> On Fri, Nov 4, 2016 at 9:55 AM, Chris Jones > > wrote: >> >> >> >> On 04/11/16 05:39, David Bariod wrote: >> >> Hello, >> >> Personn

Re: How to keep uncommitted work in a git clone

2016-11-04 Thread Chris Jones
Hi, On 04/11/16 09:16, David Bariod wrote: On Fri, Nov 4, 2016 at 9:55 AM, Chris Jones mailto:jon...@hep.phy.cam.ac.uk>> wrote: On 04/11/16 05:39, David Bariod wrote: Hello, Personnally, I would just commit such change. It is cheap, can be reworked later and be

Re: How to keep uncommitted work in a git clone

2016-11-04 Thread David Bariod
On Fri, Nov 4, 2016 at 9:55 AM, Chris Jones wrote: > > > On 04/11/16 05:39, David Bariod wrote: > >> Hello, >> >> Personnally, I would just commit such change. It is cheap, can be >> reworked later and be ketp safe in a private remote repository in case >> of disaster. >> With git there are no re

Re: How to keep uncommitted work in a git clone

2016-11-04 Thread Chris Jones
On 04/11/16 05:39, David Bariod wrote: Hello, Personnally, I would just commit such change. It is cheap, can be reworked later and be ketp safe in a private remote repository in case of disaster. With git there are no reason to not commit event not ready yet change set. I would not do this,

Re: How to keep uncommitted work in a git clone

2016-11-04 Thread Chris Jones
On 04/11/16 04:18, Sterling Smith wrote: On Nov 3, 2016, at 7:54PM, Arno Hautala wrote: On Thu, Nov 3, 2016 at 9:56 PM, Ryan Schmidt wrote: Well, I tried that. I git stashed, then made changes to curl and committed them, and later when I tried to git stash pop, my other changes that I h

Re: How to keep uncommitted work in a git clone

2016-11-03 Thread David Bariod
Hello, Personnally, I would just commit such change. It is cheap, can be reworked later and be ketp safe in a private remote repository in case of disaster. With git there are no reason to not commit event not ready yet change set. Best regards, David On Fri, Nov 4, 2016 at 2:56 AM, Ryan Schmidt

Re: How to keep uncommitted work in a git clone

2016-11-03 Thread Sterling Smith
On Nov 3, 2016, at 7:54PM, Arno Hautala wrote: > On Thu, Nov 3, 2016 at 9:56 PM, Ryan Schmidt wrote: >> >> Well, I tried that. I git stashed, then made changes to curl and committed >> them, and later when I tried to git stash pop, my other changes that I had >> in my git clone were not rest

Re: How to keep uncommitted work in a git clone

2016-11-03 Thread Joshua Root
On 2016-11-4 12:56 , Ryan Schmidt wrote: With Subversion, I was accustomed to keeping changes in my working copy that I was not ready to commit yet. Git doesn't let me do that. It complains and tells me to git stash and later git stash pop. Well, I tried that. I git stashed, then made changes

Re: How to keep uncommitted work in a git clone

2016-11-03 Thread Arno Hautala
On Thu, Nov 3, 2016 at 9:56 PM, Ryan Schmidt wrote: > > Well, I tried that. I git stashed, then made changes to curl and committed > them, and later when I tried to git stash pop, my other changes that I had in > my git clone were not restored. I have no idea where they are now. Can you try `gi

Re: How to keep uncommitted work in a git clone

2016-11-03 Thread Jeremy Lavergne
Religiously use `git status`, and perhaps update your shell prompt to reflect it as well: branch name, unstaged changes, staged changes, etc. Consider looking on Google for prompts that incorporate functions like __git_ps1: GIT_PS1_SHOWDIRTYSTATE="1" GIT_PS1_SHOWUNTRACKEDFILES="1" PS1="