diff --git a/.gitattributes b/.gitattributes
index fd6464298..b2e993859 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
-/vendor/ linguist-generated
+*.go                diff=golang
+go.sum              linguist-generated merge=ours
+/vendor/            linguist-generated