From f9bc1a99e603435d140e606cbfef94baa712593e Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Wed, 16 May 2012 14:32:44 -0400
Subject: Fixes #4456: more robust .gitignore (1.8)

---
 .gitignore | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index d0408c0ca..c0bba2c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
-# site-specific stuff
-/.htaccess
+# ignore Elgg configuration
 /engine/settings.php
+/.htaccess
 /mod/*
 
-# never ignore bundled plugins
+# don't ignore bundled plugins
 !/mod/blog/
 !/mod/bookmarks/
 !/mod/categories/
@@ -38,30 +38,17 @@
 !/mod/uservalidationbyemail/
 !/mod/zaudio/
 
-# Eclipse
-/.buildpath
-/.settings
-/.project
-
-# PHPStorm
-/.idea
-
-# NetBeans
+# ignore IDE/hidden/OS cache files
+.*
+*~
 /nbproject
 /nb-configuration.xml
-
-# vim
-.*.sw[a-z]
-*.un~
 Session.vim
-
-# Textmate
 *.tmproj
 *.tmproject
 tmtags
-
-# OS junk
-.DS_Store
-._*
 Thumbs.db
 Desktop.ini
+
+# don't ignore travis config
+!/.travis.yml
-- 
cgit v1.2.3