Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# 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
Expand All @@ -6,8 +17,6 @@ composer.phar export-ignore
phpunit.xml.dist export-ignore
/travis export-ignore

# Auto detect text files and perform LF normalization
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
Expand All @@ -27,4 +36,4 @@ phpunit.xml.dist export-ignore
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.RTF diff=astextplain
Loading