diff options
| author | bmw <bmw@users.noreply.github.com> | 2016-06-17 00:29:39 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-17 00:29:39 +0300 |
| commit | 553b3162e75fbfdcbce57502170eeb871d5675e7 (patch) | |
| tree | d608c1260b4a1fff88442ba995cc1d8a9ca66c01 /.gitattributes | |
| parent | 72724f729aa43dad07a0aa0f089e5c18a2c832d2 (diff) | |
| parent | b7c00a889a607add72823aa20ccf4874a585a8eb (diff) | |
Merge pull request #2136 from tboegi/gitattributes_eol_overrideses_auto
.gitattributes: EOL=LF overrides auto
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 8c41b686e..0f8bbbfb5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,7 +1,15 @@ -* text=auto eol=lf +#Default, normalize CRLF into LF in non-binary files +# Files identified as binary by Git are not changed +* crlf=auto # special files +*.sh crlf=input +*.py crlf=input + *.bat text eol=crlf + +*.der binary +*.gz binary *.jpeg binary *.jpg binary *.png binary |