Permalink
Browse files

Fixes #4456: more robust .gitignore (1.8)

  • Loading branch information...
1 parent 472ac1d commit f9bc1a99e603435d140e606cbfef94baa712593e @mrclay mrclay committed May 16, 2012
Showing with 9 additions and 22 deletions.
  1. +9 −22 .gitignore
View
@@ -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

0 comments on commit f9bc1a9

Please sign in to comment.