diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:05:45 -0700 |
| commit | 77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb (patch) | |
| tree | 495b1e7e6400c0fb506d97bceb3bacd005f9021e /git-am.sh | |
| parent | Merge branch 'jg/status-config' (diff) | |
| parent | diff: demote core.safecrlf=true to core.safecrlf=warn (diff) | |
| download | tgif-77f3c3f17401a74b9036188a6a6a4fe2c4b53ccb.tar.xz | |
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
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions