From: Wincent Colaiuta <win@wincent.com>
Date: Fri, 14 Dec 2007 07:24:04 GMT
Subject: Re: [PATCH 2/5] New version of pre-commit hook
Message-ID: <06C937AD-24B3-496B-AE76-B63CA007BEBB@wincent.com>
In-Reply-To: <fjsi37$7ji$1@ger.gmane.org>

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