From 8eef6411717bd11d80c49b9ed717c8602a0ce8b5 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Fri, 20 Apr 2012 10:56:14 -0300
Subject: Fixes #4456: Filter more IDEs/OS junk in .gitignore

---
 .gitignore | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index edfede73b..f3cd105c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
-/engine/settings.php
 /.htaccess
-/.buildpath
-/.settings
-/.project
+/engine/settings.php
+
 /mod/*
 !/mod/blog/
 !/mod/bookmarks/
@@ -38,3 +36,30 @@
 !/mod/uservalidationbyemail/
 !/mod/zaudio/
 
+# Eclipse
+/.buildpath
+/.settings
+/.project
+
+# PHPStorm
+/.idea
+
+# NetBeans
+/nbproject
+/nb-configuration.xml
+
+# vim
+.*.sw[a-z]
+*.un~
+Session.vim
+
+# Textmate
+*.tmproj
+*.tmproject
+tmtags
+
+# OS junk
+.DS_Store
+._*
+Thumbs.db
+Desktop.ini
-- 
cgit v1.2.3


From 472ac1d1f416eb41ecd628f3d4f06c92d8f40936 Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Fri, 27 Apr 2012 16:31:58 -0300
Subject: Amends #4456: Each section should get a comment

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f3cd105c8..d0408c0ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
+# site-specific stuff
 /.htaccess
 /engine/settings.php
-
 /mod/*
+
+# never ignore bundled plugins
 !/mod/blog/
 !/mod/bookmarks/
 !/mod/categories/
-- 
cgit v1.2.3


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