From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/82ec54dc8bbb653faa64638d74129e45aea3326b 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