Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030271AbVINQoO (ORCPT ); Wed, 14 Sep 2005 12:44:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030265AbVINQoO (ORCPT ); Wed, 14 Sep 2005 12:44:14 -0400 Received: from smtp.osdl.org ([65.172.181.4]:39105 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1030271AbVINQoN (ORCPT ); Wed, 14 Sep 2005 12:44:13 -0400 Date: Wed, 14 Sep 2005 09:43:59 -0700 (PDT) From: Linus Torvalds To: Alejandro Bonilla Beeche cc: Keith Owens , Linux Kernel Mailing List Subject: Re: "Read my lips: no more merges" - aka Linux 2.6.14-rc1 In-Reply-To: <1126674993.5681.9.camel@localhost.localdomain> Message-ID: References: <7255.1126583985@kao2.melbourne.sgi.com> <1126674993.5681.9.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 804 Lines: 24 On Tue, 13 Sep 2005, Alejandro Bonilla Beeche wrote: > > Again, this is what I do: > > cd linux-2.6 > git pull rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git > git checkout What does "git log" state? Do you have recent state there? (ie it should have dates in the "Sep 12" kind of timeframe) Also, if you have done something earlier that updated your HEAD file _without_ actually updating your checked out status, then "git checkout" may decide that it has nothing to do. You can try "git checkout -f" in that case. Linus - 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/