diff --git a/.gitignore b/.gitignore
index 50d278d8f4..c2acf8fec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,16 @@
+# Ignore Drupal 8 core files.
+/web/*
+!/web/*/
+/web/sites/default/default.services.yml
+/web/sites/default/default.settings.php
+/web/sites/development.services.yml
+/web/sites/example.*.php
+
+# Uncomment in case you want to commit a custom version of one of these files.
+#!/web/.htaccess
+#!/web/robots.txt
+#!/web/web.config
+
 # Ignore directories generated by Composer
 /drush/contrib/
 /vendor/
@@ -8,8 +21,7 @@
 /web/libraries/
 
 # Ignore sensitive information
-/web/sites/*/settings.php
-/web/sites/*/settings.local.php
+/web/sites/*/settings*.php
 
 # Ignore Drupal's file directory
 /web/sites/*/files/