diff --git a/.gitattributes b/.gitattributes index 422659a..357b869 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,30 +1,39 @@ -.gitattributes export-ignore -.gitignore export-ignore -.travis.yml export-ignore -composer.lock export-ignore -composer.phar export-ignore -phpunit.xml.dist export-ignore -/travis export-ignore - -# Auto detect text files and perform LF normalization -* text=false - -# Custom for Visual Studio -*.cs diff=csharp -*.sln merge=union -*.csproj merge=union -*.vbproj merge=union -*.fsproj merge=union -*.dbproj merge=union - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain \ No newline at end of file +# Normalize line endings to LF in the repository +* text=auto eol=lf + +# Never convert line endings in binary files +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.webp binary +*.ico binary + +.gitattributes export-ignore +.gitignore export-ignore +.travis.yml export-ignore +composer.lock export-ignore +composer.phar export-ignore +phpunit.xml.dist export-ignore +/travis export-ignore + + +# Custom for Visual Studio +*.cs diff=csharp +*.sln merge=union +*.csproj merge=union +*.vbproj merge=union +*.fsproj merge=union +*.dbproj merge=union + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain