diff --git a/.gitignore b/.gitignore
index 94eebad34..5820f909e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
-.DS_Store
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
 tmp/*
 log/*.log
 public/static/
-.idea
 .bundle