]> rtime.felk.cvut.cz Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e29497d 5430bb2)
Merge branch 'jc/maint-diff-core-safecrlf'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:05:45 +0000 (13:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2013 20:05:45 +0000 (13:05 -0700)
"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

1  2 
diff.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
Git mirror and local development