aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2012-04-20 10:56:14 -0300
committerSteve Clay <steve@mrclay.org>2012-04-20 10:56:14 -0300
commit8eef6411717bd11d80c49b9ed717c8602a0ce8b5 (patch)
treebf9817d7506adc02a3333d3663fddf79f54deeba
parent8b1036819422049d81bca3384259ac2f74e7a27a (diff)
downloadelgg-8eef6411717bd11d80c49b9ed717c8602a0ce8b5.tar.gz
elgg-8eef6411717bd11d80c49b9ed717c8602a0ce8b5.tar.bz2
Fixes #4456: Filter more IDEs/OS junk in .gitignore
-rw-r--r--.gitignore33
1 files 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