From mboxrd@z Thu Jan 1 00:00:00 1970 From: david@lang.hm Subject: RE: Date: Thu, 7 May 2009 16:07:51 -0700 (PDT) Message-ID: References: <454B76988CBF42F5BCACA5061125D263@caottdt504> <81b0412b0905071013y241f7eas8417127e51ff52fa@mail.gmail.com> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Bevan Watkiss , "'Alex Riesen'" , Git Mailing List To: Linus Torvalds X-From: git-owner@vger.kernel.org Fri May 08 01:12:05 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1M2Cky-000728-8F for gcvg-git-2@gmane.org; Fri, 08 May 2009 01:12:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752796AbZEGXJI (ORCPT ); Thu, 7 May 2009 19:09:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752694AbZEGXJG (ORCPT ); Thu, 7 May 2009 19:09:06 -0400 Received: from mail.lang.hm ([64.81.33.126]:42169 "EHLO bifrost.lang.hm" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752223AbZEGXJG (ORCPT ); Thu, 7 May 2009 19:09:06 -0400 Received: from asgard.local (asgard.lang.hm [10.0.0.100]) by bifrost.lang.hm (8.13.4/8.13.4/Debian-3) with ESMTP id n47N7pS6025415; Thu, 7 May 2009 16:07:51 -0700 X-X-Sender: dlang@asgard In-Reply-To: User-Agent: Alpine 1.10 (DEB 962 2008-03-14) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Thu, 7 May 2009, Linus Torvalds wrote: > On Thu, 7 May 2009, david@lang.hm wrote: >> >> even with this a git checkout -f should replace all files, correct? > > Hmm. I don't think so. > > As far as I recall, "-f" only overrides certain errors (like unmerged > files or not up-to-date content), it doesn't change behavior wrt files > that git thinks are already up-to-date. what about a reset --hard? (is there any command that would force the files to be re-written, no matter what git thinks is already there) David Lang