From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2013 20:05:45 +0000 (-0700)
Subject: Merge branch 'jc/maint-diff-core-safecrlf'
X-Git-Tag: v1.8.4-rc0~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb;p=git

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

"git diff" refused to even show difference when core.safecrlf is
set to true (i.e. error out) and there are offending lines in the
working tree files.

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

77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb