Re: Linux 2.6.12-rc3

[Pavel Machek <pavel@ucw.cz>]

Hi!

> > > > Well, not sure.
> > > > 
> > > > I did 
> > > > 
> > > > git track linus
> > > > git cancel
> > > > 
> > > > but Makefile still contains -rc2. (Is "git cancel" right way to check
> > > > out the tree?)
> > > 
> > > No. git cancel does what it says - cancels your local changes to the
> > > working tree. git track will only set that next time you pull from
> > > linus, the changes will be automatically merged. (Note that this will
> > > change with the big UI change.)
> > 
> > Is there way to say "forget those changes in my repository, I want
> > just plain vanilla" without rm -rf?
> 
> git cancel will give you "plain last commit". If you need plain vanilla,
> the "hard way" now is to just do
> 
> 	commit-id >.git/HEAD
> 
> but your current HEAD will be lost forever. Or do
> 
> 	git fork vanilla ~/vanilla linus
> 
> and you will have the vanilla tree tracking linus in ~/vanilla.

Yep, symlinked in nice way. Good trap; it cought me ;-). (I of course
deleted the original directory).

> I'm not yet sure if we should have some Cogito interface for doing this
> and what its semantics should be.

Perhaps "git init" is right command for this? Running it in non-empty
directory for faster restart after bad problem....
								Pavel
-- 
Boycott Kodak -- for their patent abuse against Java.