From: Christian Holtje <docwhat@gmail.com>
Date: Wed, 25 Jun 2008 00:19:17 GMT
Subject: Re: [PATCH] pre-commit hook should ignore carriage returns at EOL
Message-ID: <8EDBCDE3-1155-4C44-B3BF-FB7F16AC9AE8@gmail.com>
In-Reply-To: <7vbq1q9zct.fsf@gitster.siamese.dyndns.org>


On Jun 24, 2008, at 7:39 PM, Junio C Hamano wrote:

> Jakub Narebski <jnareb@gmail.com> writes:
>
>> Christian Holtje <docwhat@gmail.com> writes:
>>
>>> Based on the information about core.whitespace doesn't git do this
>>> already?  Maybe we should just delete the pre-commit hook or make it
>>> empty with a note saying what you can do with it?
>>
>> pre-commit hook also detects unresolved merge conflicts, which
>> core.whitespace doesn't (and probably shouldn't).
>
> But perhaps "diff --check" should.
>

definitely; that sounds like an obvious thing for "diff --check".

Ciao!