diff --git a/.gitattributes b/.gitattributes
index bfd74e3858..14e8d36f81 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -13,6 +13,7 @@ scripts/                export-ignore
 .markdownlint-cli2.yaml export-ignore
 .remarkignore           export-ignore
 .remarkrc               export-ignore
+.shellcheckrc           export-ignore
 .yamllint.yml           export-ignore
 phpcs.xml.dist          export-ignore
 phpstan.neon.dist       export-ignore
diff --git a/.gitignore b/.gitignore
index 3152b53c61..17de26087e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,12 @@
+.idea/*
+build/
+lib/
+node_modules/
+vendor/
+/.phpunit.result.cache
 /CodeSniffer.conf
+/composer.lock
 /phpcs.xml
+/phpstan.neon
 /phpunit.xml
-.phpunit.result.cache
-/build/
-.idea/*
-/vendor/
-composer.lock
-phpstan.neon
-/node_modules/
 /tests/EndToEnd/Fixtures/*.fixed
-/lib/