From: Petr Baudis <pasky@ucw.cz>
To: Pavel Machek <pavel@ucw.cz>
Cc: Linus Torvalds <torvalds@osdl.org>,
kernel list <linux-kernel@vger.kernel.org>,
git@vger.kernel.org
Subject: Re: Linux 2.6.12-rc3
Date: Thu, 21 Apr 2005 21:09:56 +0200 [thread overview]
Message-ID: <20050421190956.GA7443@pasky.ji.cz> (raw)
In-Reply-To: <20050421190009.GC475@openzaurus.ucw.cz>
Dear diary, on Thu, Apr 21, 2005 at 09:00:09PM CEST, I got a letter
where Pavel Machek <pavel@ucw.cz> told me that...
> Hi!
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.
I'm not yet sure if we should have some Cogito interface for doing this
and what its semantics should be.
> I see quite a lot of problems with fsck-tree. Is that normal?
> (I ran out of disk space few times during different operations...)
Actually, in case your tree is older than about two days, I hope you did
the convert-cache magic or fetched a fresh tree?
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
next parent reply other threads:[~2005-04-21 19:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Pine.LNX.4.58.0504201728110.2344@ppc970.osdl.org>
[not found] ` <20050421112022.GB2160@elf.ucw.cz>
[not found] ` <20050421120327.GA13834@elf.ucw.cz>
[not found] ` <20050421162220.GD30991@pasky.ji.cz>
[not found] ` <20050421190009.GC475@openzaurus.ucw.cz>
2005-04-21 19:09 ` Petr Baudis [this message]
2005-04-21 21:38 ` Linux 2.6.12-rc3 Pavel Machek
2005-04-21 21:41 ` Petr Baudis
2005-04-21 22:30 ` Pavel Machek
2005-04-23 21:31 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050421190956.GA7443@pasky.ji.cz \
--to=pasky@ucw.cz \
--cc=git@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).