2013-04-05 05:20:57 -04:00
|
|
|
# Set default behaviour, in case users don't have core.autocrlf set.
|
2013-02-05 14:16:51 -05:00
|
|
|
* text=auto
|
2013-03-23 06:19:26 -04:00
|
|
|
|
2013-04-05 05:20:57 -04:00
|
|
|
# Explicitly declare text files we want to always be normalized and converted
|
|
|
|
|
# to native line endings on checkout.
|
|
|
|
|
*.yml text
|
|
|
|
|
|
2013-03-23 06:19:26 -04:00
|
|
|
# Custom for Visual Studio, very unlikely, but lets keep it
|
|
|
|
|
*.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
|
