On Fri, Jun 19, 2015 at 5:28 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Paul Tan <pyokagan@xxxxxxxxx> writes: > >> If a file is unchanged but stat-dirty, git-apply may erroneously fail to >> apply patches, thinking that they conflict with a dirty working tree. >> >> As such, since 2a6f08a (am: refresh the index at start and --resolved, >> 2011-08-15), git-am will refresh the index before applying patches. >> Re-implement this behavior. > > Good. > > I would actually have expected to see this as part of 08/31, though. Ah right, makes sense since this patch is primarily about git-apply. I've squashed this patch into 08/31. Regards, Paul -- 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