Re: [PATCH 2/5] New version of pre-commit hook

El 14/12/2007, a las 1:17, Jakub Narebski escribió:

Wincent Colaiuta wrote:

quoted

Now that "git diff --check" indicates problems with its exit code the
pre-commit hook becomes a trivial one-liner.

quoted

-         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