Merge pull request #8859 from annando/fix-callstack

[friendica.git/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index de0fbc3..2d8acf0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,21 +1,24 @@
 favicon.*
-.htconfig.php
-.htpreconfig.php
+/.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.config.php
+/config/addon.config.php
+/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
@@ -30,6 +33,9 @@ report/
 #ignore NetBeans IDE's private files (at least)
 /nbproject/private/
 
+Ignore config files from VSCode
+/.vscode/
+
 #ignore smarty cache
 /view/smarty3/compiled/
 
@@ -61,5 +67,15 @@ venv/
 #ignore config files from JetBrains
 /.idea
 
-#ignore addons/ directory
-addons/
+#ignore addons directory
+/addons
+/addon
+
+#ignore .htaccess
+.htaccess
+
+#ignore filesystem storage default path
+/storage
+
+#Ignore log folder
+/log