From: Jakub Narebski Date: Wed, 06 Dec 2006 10:20:51 GMT Subject: Re: how to revert changes in working tree? Message-ID: In-Reply-To: <45769417.70601@gmail.com> 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