summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..4bcb1169e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+* text=auto whitespace=blank-at-eol,tab-in-indent,trailing-space,tabwidth=2
+
+*.bat text eol=crlf
+*.sh text eol=lf
+
+*.sln text eol=crlf -whitespace
+*.csproj text eol=crlf -whitespace merge=union
+*.vcxproj text eol=crlf -whitespace merge=union
+*.props text eol=crlf -whitespace merge=union