Merge pull request #658 from ZogStriP/prevent-crlf-on-yml-files

prevent crlf on yml files
This commit is contained in:
Robin Ward 2013-04-05 08:16:22 -07:00
commit 63f252c142
1 changed files with 5 additions and 4 deletions

9
.gitattributes vendored
View File

@ -1,9 +1,10 @@
# This is the standard LF normalization file used on windows
#
# Auto detect text files and perform LF normalization
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto
# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.
*.yml text
# Custom for Visual Studio, very unlikely, but lets keep it
*.cs diff=csharp
*.sln merge=union