Merge 290506ea37 into 9f6a1f7e79

[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.
2024-11-22 11:46:40 +00:00 · 2024-10-17 16:24:13 +00:00 · 2024-10-17 16:24:03 +00:00
1 changed files with 3 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1,3 @@
-/vendor/ linguist-generated
+*.go                diff=golang
+go.sum              linguist-generated merge=ours
+/vendor/            linguist-generated