public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #4077 from alcohol/force-lf-eol-for-functional-test-fixtures 

force eol LF style, php diff, and some whitespace flags
pull/4081/head
Jordi Boggiano 2015-05-28 14:20:53 +01:00
parent 8cae147572 899d9e5134
commit ac17e4a32f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitattributes vendored
View File

@ -1,4 +1,8 @@
* text=auto # Auto-detect text files, ensure they use LF.
*.php text diff=php * text=auto eol=lf
*.json text eol=lf
*.test text eol=lf # These files are always considered text and should use LF.
# See core.whitespace @ http://git-scm.com/docs/git-config for whitespace flags.
*.php text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4 diff=php
*.json text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4
*.test text eol=lf whitespace=blank-at-eol,blank-at-eof,space-before-tab,tab-in-indent,tabwidth=4