summaryrefslogtreecommitdiffhomepage
path: root/.gitattributes
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-06-08 11:14:50 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-06-08 11:14:50 +0200
commit7fb6830668a6eb40aa37b9cee2d69ca0217c6042 (patch)
tree8c1d5440ca0d932e96bb72d1849ee7abdf9c187e /.gitattributes
parentf4cc460ca56298d3cc270c64eb63cc25ff763c29 (diff)
parentd659bae3b2effb336970e1b16d33f19f3b68bf66 (diff)
downloadmullvadvpn-7fb6830668a6eb40aa37b9cee2d69ca0217c6042.tar.xz
mullvadvpn-7fb6830668a6eb40aa37b9cee2d69ca0217c6042.zip
Merge branch 'windows_installer'
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..64584601b1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Set the default behavior
+* text=auto
+
+# Do not break script files on Windows (Cygwin gets upset with CRLF)
+*.sh text eol=lf