23.06.2011 10:07, Erich Titl пишет: > Hi Andrew > > at 23.06.2011 00:56, Andrew wrote: >> 23.06.2011 00:19, Erich Titl пишет: > .... > >> It seems that you have at least one unpushed commit. >> Easiest and most predictable way to resolve this IMHO todo next steps: >> 1) Mark this commit as new branch (git branch experimental) >> 2) Rollback to commit from remote tree (git reset --hard 72d572c) >> 3) Do 'git pull' (this will pull all changes of original repo) >> 4) Switch to your experimental branch and do 'git rebase master' (this >> will apply all commits from master branch to your experimental one) > Ok this leaves me now with a flat hierarchy under ...../leaf > > Is this the goal that we just have a leaf directory? I recall that > someone muttered something of a BuC directory beneath leaf. > > My git log shows an awfully old entry on top now, which I am not sure it > is the correct one. > > commit 1f8bb69aa9b81db2132e3822a21bd6bd879b5cf2 > Author: mega<m...@luna.think.ch> > Date: Tue Jun 14 23:49:55 2011 +0200 > > fixed parsing bug for free memory, probably due to different formatting > of the busybox free applet > > I am afraid I lost lots of my work. And I don't just want to push > blindly as I don't want to overwrite the origin. > > cheers > > Erich > On what branch you are now (do 'git branch')?
------------------------------------------------------------------------------ Simplify data backup and recovery for your virtual environment with vRanger. Installation's a snap, and flexible recovery options mean your data is safe, secure and there when you need it. Data protection magic? Nope - It's vRanger. Get your free trial download today. http://p.sf.net/sfu/quest-sfdev2dev _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
