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".
Cheers,
Wincent
-
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
