1 files changed, 31 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 6bc915a8ee..19700fef06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,33 @@
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
 *~
+*.sass-cache
+
+# OS or Editor folders
 .DS_Store
-thumbs.db
-js/min
-\ No newline at end of file
+Thumbs.db
+.cache
+.project
+.settings
+.tmproj
+*.esproj
+nbproject
+*.sublime-project
+*.sublime-workspace
+
+# Komodo
+*.komodoproject
+.komodotools
+
+# Folders to ignore
+.hg
+.svn
+.CVS
+.idea
+\ No newline at end of file