diff --git a/.gitattributes b/.gitattributes
index b002a5dde7..c7a3f7a868 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,2 @@
-/**/*.pb.go -diff binary
+/**/*.pb.go -diff -merge
+/**/*.pb.go linguist-generated=true