diff options
| author |  Daenney <daenney@users.noreply.github.com> | 2024-10-17 18:24:03 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-10-17 16:24:03 +0000 |
| commit | 9f6a1f7e7931d13827b13f1ea7f500e3c6cb6bbf (patch) | |
| tree | cc0dbae8ebe96ca32a2051ee6dd91b053e219217 | |
| parent | [docs/bugfix] Fix access to /dev and /tmp in AppArmor profile (#3444) (diff) | |
| download | gotosocial-9f6a1f7e7931d13827b13f1ea7f500e3c6cb6bbf.tar.xz | |
[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.
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 3 insertions, 1 deletions
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 |