diff --git a/.gitignore b/.gitignore
index dfa4ac37c..035703f7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,12 @@
+#
+# NOTE! Don't add files that are generated in specific
+# subdirectories here. Add them in the ".gitignore" file
+# in that subdirectory instead.
+#
+# NOTE! Please use 'git ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
 *.o
 *.a
 *.la