diff options
| author | Steve Clay <steve@mrclay.org> | 2012-05-16 14:32:44 -0400 |
|---|---|---|
| committer | Steve Clay <steve@mrclay.org> | 2012-05-16 14:32:44 -0400 |
| commit | f9bc1a99e603435d140e606cbfef94baa712593e (patch) | |
| tree | cb0ce29a1e2b13d60be00648c644a9f778c4e892 | |
| parent | 472ac1d1f416eb41ecd628f3d4f06c92d8f40936 (diff) | |
| download | elgg-f9bc1a99e603435d140e606cbfef94baa712593e.tar.gz elgg-f9bc1a99e603435d140e606cbfef94baa712593e.tar.bz2 | |
Fixes #4456: more robust .gitignore (1.8)
| -rw-r--r-- | .gitignore | 31 |
1 files 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 |