1 files changed, 68 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index d4c4f686c..4ca70a186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,72 @@
+# Editor temporary/working/backup files #
+#########################################
+.#*
+[#]*#
 *~
-*.o
+*$
+*.bak
+*.diff
+*.org
+.project
+*.rej
+.settings/
+.*.sw[nop]
+.sw[nop]
+*.tmp
+
+# Compiled source #
+###################
 *.a
-*.pyc
-*.swp
-*.pyo
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.py[ocd]
 *.so
-*.pyd
-.gdb_history
-dist
-/build
-/dist
-/doc/build
-/doc/cdoc/build
-.\#*
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.bz2
+*.bzip2
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.tbz2
+*.tgz
+*.zip
+
+# Python files #
+################
+build            # setup.py working directory
+_build           # sphinx build directory
+dist             # setup.py dist directory
+doc/build
+doc/cdoc/build
+*.egg-info       # Egg metadata
+./.shelf         # The shelf plugin uses this dir
+
+# Logs and databases #
+######################
 *.log
-*.egg-info
-/numpy/core/__svn_version__.py
-/doc/numpy.scipy.org/_build
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.gdb_history
+.DS_Store?
+ehthumbs.db
+Icon?
+Thumbs.db
+
+# Things specific to this project #
+###################################
+numpy/core/__svn_version__.py
+doc/numpy.scipy.org/_build