Re: How to keep uncommitted work in a git clone

2016-11-06 Thread Chris Jones
> On 5 Nov 2016, at 9:58 pm, Rainer Müller wrote: > >> On 2016-11-05 09:07, Mojca Miklavec wrote: >> # go to master and pull the latest changes >> git checkout master >> git pull --rebase >> >> # if you did your work on libpng in master, you are then set >> >> # else go to your libpng branch

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Rainer Müller
On 2016-11-05 09:07, Mojca Miklavec wrote: > # go to master and pull the latest changes > git checkout master > git pull --rebase > > # if you did your work on libpng in master, you are then set > > # else go to your libpng branch and rebase the changes on top of the > latest master > git rebase

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Christopher Jones
> On 5 Nov 2016, at 4:50 pm, Michael wrote: > > 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 crea

Re: How to keep uncommitted work in a git clone

2016-11-05 Thread Blair Zajac
> On Nov 5, 2016, at 1:24 AM, Ryan Schmidt wrote: > > >> 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 re