From 1c014613a9924a3a3715821ff4b65531bee5b630 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@gmail.com>
Date: Thu, 19 Jan 2012 20:31:45 +0000
Subject: [PATCH] Add various always-ignore extensions, files, and folders to
 `.gitignore`

---
 .gitignore | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 38ad090992..2da5c5c5d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,36 @@
+# Numerous always-ignore extensions
+*.diff
+*.err
+*.orig
+*.log
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+*.sass-cache
+
+# OS or Editor folders
 .DS_Store
-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
+
+# Misc
+js/min