diff --git a/.gitignore b/.gitignore
index efe6c66dfc01e..2964b1ead0f0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,8 +66,21 @@ doc/install.lock
 /composer.json
 /composer.lock
 
-# to execute pre-commit
-local.sh
+# Local script, executed during pre-commit
+/local.sh
+
+# Local phpstan configuration
+/phpstan.neon
+/phpstan-baseline.neon
+
+# Logs
+/*.log
+
+# Vim swap files
+*.sw?
+
+# Generated by PHPUNIT.BAT
+/INI_PHPUNIT
 
 # ignore cache builds
 /build/phpstan/phpstan
@@ -75,3 +88,4 @@ local.sh
 phpstan_custom.neon
 /.php-cs-fixer.cache
 /.php_cs.cache
+/.cache
diff --git a/phpstan.neon b/phpstan.neon.dist
similarity index 100%
rename from phpstan.neon
rename to phpstan.neon.dist