Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030267AbVINQwq (ORCPT ); Wed, 14 Sep 2005 12:52:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1030280AbVINQwp (ORCPT ); Wed, 14 Sep 2005 12:52:45 -0400 Received: from linuxwireless.org.ve.carpathiahost.net ([66.117.45.234]:34017 "EHLO linuxwireless.org.ve.carpathiahost.net") by vger.kernel.org with ESMTP id S1030267AbVINQwp (ORCPT ); Wed, 14 Sep 2005 12:52:45 -0400 Reply-To: From: "Alejandro Bonilla" To: "'Linus Torvalds'" Cc: "'Keith Owens'" , "'Linux Kernel Mailing List'" Subject: RE: "Read my lips: no more merges" - aka Linux 2.6.14-rc1 Date: Wed, 14 Sep 2005 10:52:36 -0600 Message-ID: <008d01c5b94c$b62fdbd0$a20cc60a@amer.sykes.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook CWS, Build 9.0.6604 (9.0.2911.0) In-Reply-To: X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1506 Importance: Normal Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 911 Lines: 31 > On Tue, 13 Sep 2005, Alejandro Bonilla Beeche wrote: > 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, Thanks for the reply. I'm almost sure I did all the above following Jeff's document. I will do it again to make sure. Additionaly, thanks for the git log tip. I didn't know how to check how new the git tree was. .Alejandro > 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/