Skip to content

Commit

Permalink
[chore] Set some additional git attributes (#3454)
Browse files Browse the repository at this point in the history
* .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.
  • Loading branch information
daenney authored Oct 17, 2024
1 parent 2a43768 commit 9f6a1f7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/vendor/ linguist-generated
*.go diff=golang
go.sum linguist-generated merge=ours
/vendor/ linguist-generated

0 comments on commit 9f6a1f7

Please sign in to comment.