Martijn van Dijk
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
28 additions and
5 deletions
-
.gitattributes
|
|
@ -1,7 +1,15 @@ |
|
|
|
############################################################################### |
|
|
|
# Set default behavior to automatically normalize line endings. |
|
|
|
############################################################################### |
|
|
|
* text=auto |
|
|
|
* text=lf |
|
|
|
|
|
|
|
# Check out the following as ln always for osx/linux/cygwin |
|
|
|
*.sh text eol=lf |
|
|
|
|
|
|
|
# Windows specific files should always be crlf on checkout |
|
|
|
*.bat text eol=crlf |
|
|
|
*.cmd text eol=crlf |
|
|
|
*.ps1 text eol=crlf |
|
|
|
|
|
|
|
############################################################################### |
|
|
|
# Set default behavior for command prompt diff. |
|
|
@ -10,7 +18,19 @@ |
|
|
|
# default for csharp files. |
|
|
|
# Note: This is only used by command line |
|
|
|
############################################################################### |
|
|
|
#*.cs diff=csharp |
|
|
|
*.config text |
|
|
|
*.cs text diff=csharp |
|
|
|
*.csproj text |
|
|
|
*.md text |
|
|
|
*.msbuild text |
|
|
|
*.nuspec text |
|
|
|
*.pp text |
|
|
|
*.ps1 text |
|
|
|
*.sln text |
|
|
|
*.tt text |
|
|
|
*.txt text |
|
|
|
*.xaml text |
|
|
|
*.xml text |
|
|
|
|
|
|
|
############################################################################### |
|
|
|
# Set the merge driver for project and solution files |
|
|
@ -40,9 +60,12 @@ |
|
|
|
# |
|
|
|
# image files are treated as binary by default. |
|
|
|
############################################################################### |
|
|
|
#*.jpg binary |
|
|
|
#*.png binary |
|
|
|
#*.gif binary |
|
|
|
*.bmp binary |
|
|
|
*.jpeg binary |
|
|
|
*.jpg binary |
|
|
|
*.nupkg binary |
|
|
|
*.png binary |
|
|
|
*.sdf binary |
|
|
|
|
|
|
|
############################################################################### |
|
|
|
# diff behavior for common document formats |
|
|
|