| commit | 77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jul 2013 20:05:45 +0000 (11 13:05 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Jul 2013 20:05:45 +0000 (11 13:05 -0700) | ||
| tree | 495b1e7e6400c0fb506d97bceb3bacd005f9021e | treesnapshot (tar.gz zip) |
| parent | e29497d28ce1ec9f76493542fcab4a8d61ca5fce | commitdiff |
| parent | 5430bb283b478991a979437a79e10dcbb6f20e28 | commitdiff |
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
"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
| diff.c | diff1 | diff2 | blobhistory |