2013-10-12 12:28:24 +02:00
|
|
|
# Auto detect text files and perform LF normalization
|
|
|
|
|
* text=auto
|
|
|
|
|
|
|
|
|
|
# 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
|
2013-10-12 12:50:10 +02:00
|
|
|
|
2013-10-22 23:44:42 +02:00
|
|
|
# These files are text and should be normalized (Convert crlf => lf)
|
2013-10-12 12:50:10 +02:00
|
|
|
*.java text
|
|
|
|
|
*.xml text
|
|
|
|
|
*.txt text
|
|
|
|
|
|
|
|
|
|
# These files are binary and should be left untouched
|
|
|
|
|
# (binary is a macro for -text -diff)
|
|
|
|
|
*.jar binary
|
|
|
|
|
*.so binary
|
|
|
|
|
*.dll binary
|
