Re: [PATCH] pre-commit hook should ignore carriage returns at EOL

[Junio C Hamano <gitster@xxxxxxxxx>]

Jakub Narebski <jnareb@xxxxxxxxx> writes:

> Christian Holtje <docwhat@xxxxxxxxx> 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.

--
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