summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index ccc576c2e1..5af3e121a8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,12 +5,13 @@ thirdparty/* linguist-vendored
# Normalize EOL for all files that Git considers text files
* text=auto eol=lf
-# Except for bat files, which are Windows only files
+# Except for Windows-only / Visual Studio files
*.bat eol=crlf
+*.sln eol=crlf
+*.csproj eol=crlf
+misc/msvs/*.template eol=crlf
# And some test files where the EOL matters
*.test.txt -text
-# And also the templates for Visual Studio files, which VS will always force CRLF on
-/misc/msvs/*.template eol=crlf
# The above only works properly for Git 2.10+, so for older versions
# we need to manually list the binary files we don't want modified.