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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html