diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..1b0fba13
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,11 @@
+# Set all files to use line feed endings (since we can't match only ones without an extension)
+* eol=lf
+# And then reset all the files with extensions back to default
+*.* -eol
+
+*.sh text eol=lf
+
+# lf for the docs as it's auto-generated and will otherwise trigger an uncommited error on windows
+doc/cli.markdown text eol=lf
+# crlf for the for the windows-crlf test file
+tests/test-data/projects/no-docker-compose/basic/src/windows-crlf.sh eol=crlf
diff --git a/automation/build-bin.ts b/automation/build-bin.ts
index 373951d7..bbc39da5 100644
--- a/automation/build-bin.ts
+++ b/automation/build-bin.ts
@@ -306,6 +306,7 @@ export async function catchUncommitted(): Promise<void> {
 			'catch-uncommitted',
 			'--catch-no-git',
 			'--skip-node-versionbot-changes',
+			'--ignore-space-at-eol',
 		]);
 	}
 }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 401a898e..6b882d45 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2724,9 +2724,9 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "catch-uncommitted": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/catch-uncommitted/-/catch-uncommitted-1.4.0.tgz",
-      "integrity": "sha512-xrLMj7iYrMc3TXSLsRO9tTxfcWEUICGCDZm+WI40WznxLp/+mVE8v4RxipC/ufL5TDfAYAe1ppu5VURBN990SQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/catch-uncommitted/-/catch-uncommitted-1.5.0.tgz",
+      "integrity": "sha512-QYQ0L9+i8AgpCnGWyhn8K1OUBJ0h5MVE/dBdnWsHSk4Kr6JdPoHTQcSRIk7aWiXTveU1OxJcoF8hKTC/G3XtjQ==",
       "dev": true
     },
     "chai": {
diff --git a/package.json b/package.json
index f1cd348a..f533fd40 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "test": "mocha --timeout 6000 -r ts-node/register/transpile-only \"tests/**/*.spec.ts\"",
     "test:fast": "npm run build:fast && npm run test",
     "catch-uncommitted": "ts-node --transpile-only -P automation/tsconfig.json automation/run.ts catch-uncommitted",
-    "ci": "npm run test && catch-uncommitted",
+    "ci": "npm run test && npm run catch-uncommitted",
     "watch": "gulp watch",
     "prettify": "prettier --write \"{lib,tests,automation,typings}/**/*.js\" --config ./node_modules/resin-lint/config/.prettierrc",
     "lint": "resin-lint lib/ tests/ && resin-lint --typescript --fix automation/ lib/ typings/ tests/",
@@ -127,7 +127,7 @@
     "@types/tar-stream": "1.6.0",
     "@types/through2": "2.0.33",
     "@types/which": "^1.3.2",
-    "catch-uncommitted": "^1.4.0",
+    "catch-uncommitted": "^1.5.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "ent": "^2.2.0",