From f2fe968be463fa9bd6b482b1945803c51ebb9235 Mon Sep 17 00:00:00 2001
From: Kyle West <kswest@gmail.com>
Date: Tue, 24 Jan 2012 16:11:23 -0500
Subject: [PATCH] more complete gitignore.

---
 gitignore_global | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/gitignore_global b/gitignore_global
index 48a611b9..e807a85d 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -1,4 +1,32 @@
+# OSX       taken from: https://github.com/github/gitignore/blob/master/Global/OSX.gitignore
+# ----------------------------------------------------------------------------------------------
 .DS_Store
-tags
+# Thumbnails
+._*
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Windows   taken from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore
+# ----------------------------------------------------------------------------------------------
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Tags      taken from: https://github.com/github/gitignore/blob/master/Global/Tags.gitignore
+# ----------------------------------------------------------------------------------------------
+# Ignore tags created by etags and ctags
 TAGS
+tags
+
+# Vim       taken from: https://github.com/github/gitignore/blob/master/Global/vim.gitignore
+# ----------------------------------------------------------------------------------------------
+.*.sw[a-z]
+*.un~
+Session.vim
+
+# SASS
+# ----------------------------------------------------------------------------------------------
 .sass-cache