From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.5 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: Jakub Narebski Subject: Re: how to revert changes in working tree? Date: Wed, 06 Dec 2006 11:20:51 +0100 Organization: At home Message-ID: References: <4576680B.7030500@gmail.com> <81b0412b0612060043t488d356du8f5fcdd164a45eb5@mail.gmail.com> <45769417.70601@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit NNTP-Posting-Date: Wed, 6 Dec 2006 10:19:13 +0000 (UTC) Return-path: Envelope-to: gcvg-git@gmane.org X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 16 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: host-81-190-24-209.torun.mm.pl Mail-Copies-To: jnareb@gmail.com User-Agent: KNode/0.10.2 Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by dough.gmane.org with esmtp (Exim 4.50) id 1Grtrq-0001ir-QM for gcvg-git@gmane.org; Wed, 06 Dec 2006 11:19:11 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760437AbWLFKTH (ORCPT ); Wed, 6 Dec 2006 05:19:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760432AbWLFKTH (ORCPT ); Wed, 6 Dec 2006 05:19:07 -0500 Received: from main.gmane.org ([80.91.229.2]:52498 "EHLO ciao.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760437AbWLFKTF (ORCPT ); Wed, 6 Dec 2006 05:19:05 -0500 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1Grtre-0004xf-Cu for git@vger.kernel.org; Wed, 06 Dec 2006 11:18:58 +0100 Received: from host-81-190-24-209.torun.mm.pl ([81.190.24.209]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 06 Dec 2006 11:18:58 +0100 Received: from jnareb by host-81-190-24-209.torun.mm.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 06 Dec 2006 11:18:58 +0100 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Liu Yubao wrote: >> Do a "git repo-config core.filemode false" to almost >> disable the checks for exec bit. >> > > It has been set. I guess the cause is a interrupted merge > operation that leads to textual difference. Try also "git repo-config core.ignoreStat true". Perhaps it would help. -- Jakub Narebski Warsaw, Poland ShadeHawk on #git