Re: [leaf-devel] updating GIT repository

2013-10-10 Thread KP Kirchdörfer
Am Donnerstag, 10. Oktober 2013, 11:14:40 schrieb Erich Titl: > Hi Andrew > > on 09.10.2013 20:17, Andrew wrote: > > Hi. > > Just commit changes into this branch, and do 'git checkout master'. > > I have gotten the impreddion that my master is not what it used to be, > as development has moved to

Re: [leaf-devel] updating GIT repository

2013-10-10 Thread Erich Titl
Hi Andrew on 10.10.2013 15:51, Andrew wrote: > You try to checkout other branch, but there are modified files into tree > that should be changed during this. > You must commit your changes or reset files. OK, the message appeared clear but sometimes one is just blind Do I have to rebuild the bu

Re: [leaf-devel] updating GIT repository

2013-10-10 Thread Andrew
You try to checkout other branch, but there are modified files into tree that should be changed during this. You must commit your changes or reset files. 10.10.2013 16:16, Erich Titl ?: > Hi Andrew > > one of these weird git actions > > I set up master to track origin master but checking it o

Re: [leaf-devel] updating GIT repository

2013-10-10 Thread Erich Titl
Hi Andrew one of these weird git actions I set up master to track origin master but checking it out yields mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout master error: Your local changes to the following files would be overwritten by checkout: repo/openswan/buildtool.cfg Ple

Re: [leaf-devel] updating GIT repository

2013-10-10 Thread Andrew
Just do git checkout maint 10.10.2013 15:11, Erich Titl ?: > Hi Andrew > > on 10.10.2013 13:23, Andrew wrote: >> 4.x now is maint branch > Should I rename my master to maint then and poll master again? What else > is required? > > Thanks > > Erich > > > > >

Re: [leaf-devel] updating GIT repository

2013-10-10 Thread Erich Titl
Hi Andrew on 10.10.2013 13:23, Andrew wrote: > 4.x now is maint branch Should I rename my master to maint then and poll master again? What else is required? Thanks Erich smime.p7s Description: S/MIME Kryptografische Unterschrift --

Re: [leaf-devel] updating GIT repository

2013-10-10 Thread Andrew
4.x now is maint branch 10.10.2013 12:14, Erich Titl ?: > Hi Andrew > > on 09.10.2013 20:17, Andrew wrote: >> Hi. >> Just commit changes into this branch, and do 'git checkout master'. > I have gotten the impreddion that my master is not what it used to be, > as development has moved to 5.x. My

Re: [leaf-devel] updating GIT repository

2013-10-10 Thread Erich Titl
Hi Andrew on 09.10.2013 20:17, Andrew wrote: > Hi. > Just commit changes into this branch, and do 'git checkout master'. I have gotten the impreddion that my master is not what it used to be, as development has moved to 5.x. My master still points to 4.x. I recall there have been major modificati

Re: [leaf-devel] updating GIT repository

2013-10-09 Thread Andrew
Hi. Just commit changes into this branch, and do 'git checkout master'. 09.10.2013 20:55, KP Kirchdörfer пишет: > Am Mittwoch, 9. Oktober 2013, 10:42:15 schrieb Erich Titl: >> Hi Folks >> >> I was offline for the better part of a year and would like to get my >> hands on the current development re

Re: [leaf-devel] updating GIT repository

2013-10-09 Thread KP Kirchdörfer
Am Mittwoch, 9. Oktober 2013, 10:42:15 schrieb Erich Titl: > Hi Folks > > I was offline for the better part of a year and would like to get my > hands on the current development repository without loosing old, > possibly not committed changes. I don't have disk space to host multiple > versions an