From 9f6a1f7e7931d13827b13f1ea7f500e3c6cb6bbf Mon Sep 17 00:00:00 2001
From: Daenney <daenney@users.noreply.github.com>
Date: Thu, 17 Oct 2024 18:24:03 +0200
Subject: [PATCH] [chore] Set some additional git attributes (#3454)

* .go files are now tagged with diff=go for better diffs
* go.sum is tagged with generated which suppresses the diff
* go.sum is tagged with merge=ours to reduce merge conflicts

go.mod isn't tagged with generated since it's useful to see it on
dependency bump PRs.
---
 .gitattributes | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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