From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ingo Molnar Subject: Re: Change "pull" to _only_ download, and "git update"=pull+merge? Date: Wed, 20 Apr 2005 22:32:35 +0200 Message-ID: <20050420203235.GA13270@elte.hu> References: <20050416233305.GO19099@pasky.ji.cz> <20050419011206.GT5554@pasky.ji.cz> <42646967.9030903@dwheeler.com> <4264CCFF.30400@dgreaves.com> <20050419092812.GE2393@pasky.ji.cz> <1113905110.1262.1.camel@nosferatu.lan> <20050419105008.GB12757@pasky.ji.cz> <20050420070157.GA12584@elte.hu> <20050420200504.GB19112@pasky.ji.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Martin Schlemmer , David Greaves , dwheeler@dwheeler.com, Daniel Barkalow , git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Apr 20 22:29:19 2005 Return-path: Received: from vger.kernel.org ([12.107.209.244]) by ciao.gmane.org with esmtp (Exim 4.43) id 1DOLoY-0007bg-R0 for gcvg-git@gmane.org; Wed, 20 Apr 2005 22:28:51 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261804AbVDTUdH (ORCPT ); Wed, 20 Apr 2005 16:33:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261805AbVDTUdH (ORCPT ); Wed, 20 Apr 2005 16:33:07 -0400 Received: from mx1.elte.hu ([157.181.1.137]:36539 "EHLO mx1.elte.hu") by vger.kernel.org with ESMTP id S261804AbVDTUdE (ORCPT ); Wed, 20 Apr 2005 16:33:04 -0400 Received: from chiara.elte.hu (chiara.elte.hu [157.181.150.200]) by mx1.elte.hu (Postfix) with ESMTP id 0CB4B31D858; Wed, 20 Apr 2005 22:31:55 +0200 (CEST) Received: by chiara.elte.hu (Postfix, from userid 17806) id B5F5F1FC2; Wed, 20 Apr 2005 22:32:39 +0200 (CEST) To: Petr Baudis Content-Disposition: inline In-Reply-To: <20050420200504.GB19112@pasky.ji.cz> User-Agent: Mutt/1.4.2.1i X-ELTE-SpamVersion: MailScanner 4.31.6-itk1 (ELTE 1.2) SpamAssassin 2.63 ClamAV 0.73 X-ELTE-VirusStatus: clean X-ELTE-SpamCheck: no X-ELTE-SpamCheck-Details: score=-4.9, required 5.9, autolearn=not spam, BAYES_00 -4.90 X-ELTE-SpamLevel: X-ELTE-SpamScore: -4 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org * Petr Baudis wrote: > > yet another thing: what is the canonical 'pasky way' of simply nuking > > the current files and checking out the latest tree (according to > > .git/HEAD). Right now i'm using a script to: > > > > read-tree $(tree-id $(cat .git/HEAD)) > > checkout-cache -a > > > > (i first do an 'rm -f *' in the working directory) > > > > i guess there's an existing command for this already? > > git cancel hm, that's a pretty unintuitive name though. How about making it 'git checkout' and providing a 'git checkout -f' option to force the checkout? (or something like this) Ingo