diff --git a/.gitignore b/.gitignore
index cdef1f3..5639913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,15 @@
+# Add patterns in here to exclude files created by tools integrated with this
+# repository, such as test frameworks from the project's recommended workflow,
+# rendered documentation and package builds.
+#
+# Don't add patterns to exclude files created by preferred personal tools
+# (editors, IDEs, your operating system itself even). These should instead be
+# maintained outside the repository, for example in a ~/.gitignore file added
+# with:
+#
+# git config --global core.excludesfile '~/.gitignore'
+
+# Bytecompiled Python
 *.py[cod]
 
 # C extensions
@@ -29,11 +41,6 @@ nosetests.xml
 # Translations
 *.mo
 
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
 # Complexity
 output/*.html
 output/*/index.html
diff --git a/oslo.{{cookiecutter.module_name}}/.gitignore b/oslo.{{cookiecutter.module_name}}/.gitignore
index dfe851d..b46fd1e 100644
--- a/oslo.{{cookiecutter.module_name}}/.gitignore
+++ b/oslo.{{cookiecutter.module_name}}/.gitignore
@@ -1,3 +1,15 @@
+# Add patterns in here to exclude files created by tools integrated with this
+# repository, such as test frameworks from the project's recommended workflow,
+# rendered documentation and package builds.
+#
+# Don't add patterns to exclude files created by preferred personal tools
+# (editors, IDEs, your operating system itself even). These should instead be
+# maintained outside the repository, for example in a ~/.gitignore file added
+# with:
+#
+# git config --global core.excludesfile '~/.gitignore'
+
+# Bytecompiled Python
 *.py[cod]
 
 # C extensions
@@ -30,11 +42,6 @@ nosetests.xml
 # Translations
 *.mo
 
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
-
 # Complexity
 output/*.html
 output/*/index.html
@@ -45,7 +52,3 @@ doc/build
 # pbr generates these
 AUTHORS
 ChangeLog
-
-# Editors
-*~
-.*.swp