From: Andrew Wong Date: Tue, 12 Mar 2013 01:03:42 GMT Subject: Re: rebase: strange failures to apply patc 3-way Message-ID: <513E7EEE.3060107@gmail.com> In-Reply-To: <20130312010114.GA21026@sigill.intra.peff.net> On 03/11/13 21:01, Jeff King wrote: > From "git help config": > > core.trustctime > If false, the ctime differences between the index and the working > tree are ignored; useful when the inode change time is regularly > modified by something outside Git (file system crawlers and some > backup systems). See git-update- index(1). True by default. In an earlier email, Max did mention setting the config does workaround the issue. But it's still strange that it only happens to a few specific files in this particular repo. The issue never popped up in other repos that he has, which I assume has all been excluded from Time Machine...