diff --git a/.gitattributes b/.gitattributes
index c214d0773..b35b961e2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,8 @@
-Lib/** linguist-vendored
+Lib/**      linguist-vendored
+Cargo.lock  linguist-generated -merge
 parser/src/python.rs linguist-generated -diff -merge
+ast/src/ast_gen.rs          linguist-generated -merge
+vm/src/stdlib/ast/gen.rs    linguist-generated -merge
+parser/python.lalrpop       text eol=LF
+Lib/*.py    text working-tree-encoding=UTF-8 eol=LF
+**/*.rs     text working-tree-encoding=UTF-8 eol=LF