aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2016-06-03 13:24:32 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-06-03 13:24:32 +0100
commit23dfe8baa05c9caf8910964bc59a7d2062905dae (patch)
tree2b6ba5d9d035acaa666e56a0a15bc6dae9fd5a94 /.gitattributes
parent081e813bb87d4b75457620a6c4cdc8dde7fc5beb (diff)
Disable auto-CRLF conversion on git checkout.
If someone cloned the repository on Windows with their default git settings, then ran vagrant up, it failed because the shell files now had CRLF line endings. Rather than try and exempt the appropriate files, let's just stop git trying to do anything clever at all.
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 000000000..bfc70fec1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Disable the auto-CRLF normalization mess for all files to prevent
+# them being checked out with CRLF line endings (on Windows), which
+# breaks if they e.g. run vagrant up.
+
+* -text