I am running cygwin git version 1.6.4.2. Some of the source code for our projects is encoded in mac linefeeds due to proprietary software platform. My current solution is to flag those files tu use no linefeed conversion and to use separate diff program by having this in .gitattributes: *.BA -crlf diff=winmerge I also have these crlf settings enabled: core.autocrlf=true core.safecrlf=true This solution works, but is not optimal as git cannot follow the changed lines, produce annotations or diffs. Now I am wondering if I could make git work with a little different configuration: * The *.BA files with mac linefeeds would be stored with normal linux linefeeds * The files would be converted on checkout to mac linefeeds the same way as core.autcrlf works Is this doable or even a good approach? - Jussi Sirpoma -- 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