summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorBen Vanik <ben.vanik@gmail.com>2015-05-24 01:16:34 -0700
committerBen Vanik <ben.vanik@gmail.com>2015-05-24 01:16:34 -0700
commite97ddc25dbafce119071e5a9ecda0ebcb6536668 (patch)
treefad5d613d7f53734a4ae2c0a9e431d52db783daa /.gitattributes
parent2f905c086412628fc7e438fac5b478dabda190a5 (diff)
gitattributes (maybe).
Diffstat (limited to '.gitattributes')
-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