Hi, On Thu, 11 Jan 2007, Shawn O. Pearce wrote: > That said I don't really care about this problem that much. The problem > that I care about is its far too easy to convert the lineendings in a > file (e.g. CRLF->LF, LF->CRLF). This causes the entire file to differ, > making merges very difficult. I really should just fix it (in the one > place where it matters to me) by modifying the pre-commit hook to look > for such a case and abort. Why not just introduce a config variable, and do the conversion in-flight? Or, alternatively, do the merge ignoring white space? (Of course, this is somewhat pointless when merging whitespace fixes...) Ciao, Dscho - 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