summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-15 13:43:00 +0200
committerGravatar GitHub <noreply@github.com> 2016-10-15 13:43:00 +0200
commitf0c5943250c5a9582ebb752b92ca639cad9d283e (patch)
tree617bd60728ae9d3d714547b2f833458870ddd333 /data
parent7ec73a91bc2f1c786ada10441db37f42a6b452f4 (diff)
parent2ac71f2bd683bae06f1e4056e2893d74cf4ad430 (diff)
Merge pull request #1307 from Alkarex/update-gitignore
Update gitignore rules
Diffstat (limited to 'data')
-rw-r--r--data/.gitignore10
-rw-r--r--data/PubSubHubbub/feeds/.gitignore4
-rw-r--r--data/users/.gitignore9
3 files changed, 11 insertions, 12 deletions
diff --git a/data/.gitignore b/data/.gitignore
index c2ed350a6..76314fc12 100644
--- a/data/.gitignore
+++ b/data/.gitignore
@@ -1,10 +1,6 @@
-application.ini
config.php
-*.sqlite
-touch.txt
-no-cache.txt
-*.bak.php
-*.lock.txt
+config.php.bak.php
+force-https.txt
last_update.txt
+no-cache.txt
update.php
-force-https.txt
diff --git a/data/PubSubHubbub/feeds/.gitignore b/data/PubSubHubbub/feeds/.gitignore
index 150f68c80..d8f9df042 100644
--- a/data/PubSubHubbub/feeds/.gitignore
+++ b/data/PubSubHubbub/feeds/.gitignore
@@ -1 +1,3 @@
-*/*
+*/
+*/*.json
+*/*.txt
diff --git a/data/users/.gitignore b/data/users/.gitignore
index a8b7cd60f..3705c06b7 100644
--- a/data/users/.gitignore
+++ b/data/users/.gitignore
@@ -1,4 +1,5 @@
-db.sqlite
-config.php
-log*.txt
-
+*/
+*/config.php
+*/db.sqlite
+!_/
+*/log*.txt