X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=.gitignore;h=3250fb0761bb0e75aa55b29f15d660ed9308be15;hb=38196aec674ca9acc5db7e72898b52906f0d9070;hp=c31d8c5b5b1df0068531cf05e9a315a98e07d1c2;hpb=cdc24a73ca499b29b8ff2053a3369b5f7139dceb;p=friendica.git

diff --git a/.gitignore b/.gitignore
index c31d8c5b5b..3250fb0761 100644
--- 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/
 
@@ -54,17 +60,22 @@ nbproject
 #ignore things from transifex-client
 venv/
 
-#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
-vendor/*
-<<<<<<< HEAD
+#ignore Composer dependencies
+/vendor
+/view/asset
 
 #ignore config files from JetBrains
 /.idea
 
-#ignore addons/ directory
-addons/
+#ignore addons directory
+/addons
+/addon
+
+#ignore base .htaccess
+/.htaccess
+
+#ignore filesystem storage default path
+/storage
 
-#Ignore .htaccess as it may contain local changes
-.htaccess
-=======
->>>>>>> Fixes for composer:
+#Ignore log folder
+/log