Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/maint-diff-core-safecrlf' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 22 Jul 2013 05:48:13 +0000
(22:48 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 22 Jul 2013 05:48:13 +0000
(22:48 -0700)
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
1
2
diff.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
7c8ce4e
5430bb2
)
diff --cc
diff.c
Simple merge