summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-02-11 15:11:04 +0100
committervarac <varacanero@zeromail.org>2016-02-11 15:11:04 +0100
commit3c96919ac2f3af4a7d13feedae31a0493a00beb0 (patch)
treea5ffe31534f3bd608e628b8d1ce999cf85deee5b /.gitattributes
parent6c42deb2a99b5f0a66c29ca8f7a6cb479e51bd99 (diff)
fix windows vagrant line ending issue
where executing a mounted script in vagrant fails due to a '^M' special char at the end of each line see https://github.com/pixelated/pixelated-user-agent/issues/600#issuecomment-182306301
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 0a91f751..cd04658a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,8 @@
+# https://help.github.com/articles/dealing-with-line-endings/
+# fix windows issue where executing a mounted script
+# in vagrant fails due to a '^M' special char at the end of each line
+# see https://github.com/pixelated/pixelated-user-agent/issues/600#issuecomment-182306301
+install-pixelated.sh text eol=lf
+
# Automatically normalize line endings for all text-based files
* text=auto