]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb
tree495b1e7e6400c0fb506d97bceb3bacd005f9021etree | snapshot
parente29497d28ce1ec9f76493542fcab4a8d61ca5fcecommit | diff
parent5430bb283b478991a979437a79e10dcbb6f20e28commit | diff
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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.