From eed420d45ae203dd066d96f75643c4e91977201a Mon Sep 17 00:00:00 2001 From: Chris Bandy Date: Wed, 14 May 2025 15:06:58 -0500 Subject: [PATCH] Consolidate .gitattributes at the top level The top-level file can define macros that combine multiple attributes. --- .gitattributes | 6 ++++++ internal/collector/generated/.gitattributes | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .gitattributes delete mode 100644 internal/collector/generated/.gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..c698441f73 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# https://docs.gitlab.com/user/project/merge_requests/changes#collapse-generated-files +# https://github.com/github-linguist/linguist/blob/-/docs/overrides.md#generated-code +# https://git-scm.com/docs/gitattributes#_defining_macro_attributes +[attr]generated gitlab-generated linguist-generated + +/internal/collector/generated/*.json generated diff --git a/internal/collector/generated/.gitattributes b/internal/collector/generated/.gitattributes deleted file mode 100644 index 49e9f142dd..0000000000 --- a/internal/collector/generated/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github -/*.json linguist-generated=true