From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jun 2008 23:39:46 GMT
Subject: Re: [PATCH] pre-commit hook should ignore carriage returns at EOL
Message-ID: <7vbq1q9zct.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <m3k5gejtkp.fsf@localhost.localdomain>

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.