diff --git a/.gitignore b/.gitignore
index 8013bb17..824a9e89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,13 @@
-.DS_Store
-._*
-/src/.phutil_module_cache
-/src/extensions/*
+# NOTE: Thinking about adding files created by your operating system, IDE,
+# or text editor here? Don't! Add them to your per-user .gitignore instead.
+
+# Diviner
 /docs/
 /.divinercache/
+
+# libphutil
+/src/.phutil_module_cache
+
+# User extensions
 /externals/includes/*
+/src/extensions/*