Andrew at 23.06.2011 16:02, Andrew wrote: > 23.06.2011 16:18, Erich Titl пишет: >> Hi Andrew >> ...
>>>> >>> On what branch you are now (do 'git branch')? >> mega@luna:~/leaf/devel/leaf> git branch >> experimental >> * master >> mega@luna:~/leaf/devel/leaf> ls >> bering-uclibc4 buildlwp.sh buildtool Changes conf doc >> make repo tools >> buildimage.pl buildpacket.pl buildtool.pl cleanall.sh COPYING >> image README TODO >> >> cheers >> >> Erich >> > Strange. > In any case, all your changes are in branch 'experimental'. You can > check this by 'git checkout experimental' (don't forget to return on > main branch!). > Look again in 'git log', select commit from remote branch, and do 'git > reset --hard commit". Or try now 'git pull'. > > P.S. If you aren't sure about results - you can just make copy of all > tree or just '.git' directory (it's enough to return to your committed > state). > I did that anyway, and the above is the situation _before_ adding the remote BuC branch. Anyway, trying to apply it results in mega@luna:~/leaf/devel/leaf> git remote add BuC ssh://et...@leaf.git.sourceforge.net/gitroot/leaf/bering-uclibc fatal: remote BuC already exists. mega@luna:~/leaf/devel/leaf> git config branch.master.remote BuC mega@luna:~/leaf/devel/leaf> git config branch.master.merge refs/heads/master mega@luna:~/leaf/devel/leaf> git pull et...@leaf.git.sourceforge.net's password: Already up-to-date. mega@luna:~/leaf/devel/leaf> git log mega@luna:~/leaf/devel/leaf> git branch experimental * master I have the feeling the sequence of steps is enourmously important and navigating this maze is challenging. I guess GIT is good if you set it up once and then leve it that way. Now What am I supposed to do to get all this right again. This thing really crapped out. cheers Erich
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense.. http://p.sf.net/sfu/splunk-d2d-c1
_______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
