From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 05:48:13 +0000 (-0700)
Subject: Merge branch 'jc/maint-diff-core-safecrlf' into maint
X-Git-Tag: v1.8.3.4~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82ec54dc8bbb653faa64638d74129e45aea3326b;p=thirdparty%2Fgit.git

Merge branch 'jc/maint-diff-core-safecrlf' into maint

Avoid failing "git diff" when core.safecrlf is set to true, because
the user cannot tell where the breakage is in preparation for fixing
and committing.

* jc/maint-diff-core-safecrlf:
  diff: demote core.safecrlf=true to core.safecrlf=warn
---

82ec54dc8bbb653faa64638d74129e45aea3326b