diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..b791d92b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,8 @@
+# Normalize EOL for all files that Git considers text files
+* text=auto eol=lf
+
+# Except for bat files, which are Windows only files
+*.bat eol=crlf
+
+# And some test files where the EOL matters
+*.json -text
diff --git a/.gitignore b/.gitignore
index 85bc5d74..63923485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 build
 builddir
-.vscode
-*.swp
 doc
-capi_test.tvg
-test.tvg
+.vscode
 .idea
+*.swp
+*.tvg
+*.tmp
+*.code-workspace