> It seems like you want core.autocrlf to be false or you want a > .gitattributes file to override it on a per-file basis for the files > you know are CRLF (i.e. the ones that are CRLF even on the Linux > side). That's what I've been leaning toward: a .gitattributes in that directory like this: *.xml -crlf diff merge Does that sound reasonable? -- 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