Dnia piątek 14. grudnia 2007 08:24, Wincent Colaiuta napisał: > El 14/12/2007, a las 1:17, Jakub Narebski escribió: > >> Wincent Colaiuta wrote: >> >>> Now that "git diff --check" indicates problems with its exit code the >>> pre-commit hook becomes a trivial one-liner. >> >>> - if (/^(?:[<>=]){7}/) { >>> - bad_line("unresolved merge conflict", $_); >>> - } >> >> Aren't you losing this check with rewrite? > > Yes. If that's a problem then this is definitely a "no-goer". Well, this only means that it wouldn't be one-liner, but replacing all whitespace damage checks by "git diff --check" is still a good idea. Perhaps we could add 'merge conflict' check to git diff/git applyt too... -- Jakub Narebski Poland - 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