On 17. juni 2010, at 17.21, Matthieu Moy wrote: > Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> writes: > >> I guess this shows that correct diagnostics is not a prerequisite for a >> successful therapy ;) >> >> (The diagnostics really indicate a work tree with local uncommitted >> modifications.) > > I'd bet for this kind of issue: > > http://kerneltrap.org/mailarchive/git/2010/3/9/25215/thread > From: Johannes Schindelin > Subject: core.autocrlf considered half-assed > > Didn't follow the outcome in details, but some patches were proposed > to improve the situation. Finn Arne Gangstad's "safe autocrlf" patch (c480539, currently in next) solves the problem by disabling conversion for files that contain CRs in the repository. -- Eyvind Bernhardsen -- 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