Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261986AbVDWVeO (ORCPT ); Sat, 23 Apr 2005 17:34:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262044AbVDWVeO (ORCPT ); Sat, 23 Apr 2005 17:34:14 -0400 Received: from gprs189-60.eurotel.cz ([160.218.189.60]:7809 "EHLO amd.ucw.cz") by vger.kernel.org with ESMTP id S261986AbVDWVeG (ORCPT ); Sat, 23 Apr 2005 17:34:06 -0400 Date: Sat, 23 Apr 2005 23:31:43 +0200 From: Pavel Machek To: Petr Baudis Cc: Linus Torvalds , kernel list , git@vger.kernel.org Subject: Re: Linux 2.6.12-rc3 Message-ID: <20050423213143.GA4978@elf.ucw.cz> References: <20050421112022.GB2160@elf.ucw.cz> <20050421120327.GA13834@elf.ucw.cz> <20050421162220.GD30991@pasky.ji.cz> <20050421190009.GC475@openzaurus.ucw.cz> <20050421190956.GA7443@pasky.ji.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050421190956.GA7443@pasky.ji.cz> X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.6+20040907i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1556 Lines: 47 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. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/