forgotten $

[friendica.git/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ecfe4e7..db1c3c1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,20 +2,22 @@ favicon.*
 .htconfig.php
 .htpreconfig.php
 \#*
-include/jquery-1.4.2.min.js
 *.log
 *.out
 *.version*
-favicon.*
 home.html
-addon
+
 *~
 robots.txt
 
+#ignore local config
+/config/local.ini.php
+/config/addon.ini.php
+
 #ignore documentation, it should be newly built
-doc/html
+/doc/html
 
-#ignore reports, should be generted with every build
+#ignore reports, should be generated with every build
 report/
 
 #ignore config files from eclipse, we don't want IDE files in our repository
@@ -23,9 +25,11 @@ report/
 .buildpath
 .externalToolBuilders
 .settings
+
 #ignore OSX .DS_Store files
 .DS_Store
 
+#ignore NetBeans IDE's private files (at least)
 /nbproject/private/
 
 #ignore smarty cache
@@ -52,5 +56,16 @@ nbproject
 #ignore things from transifex-client
 venv/
 
-#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
-vendor/*
+#ignore Composer dependencies
+/vendor
+/view/asset
+
+#ignore config files from JetBrains
+/.idea
+
+#ignore addons directory
+/addons
+/addon
+
+#ignore .htaccess
+.htaccess