summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-01-01 16:23:00 +0100
committerGitHub <noreply@github.com>2017-01-01 16:23:00 +0100
commit22e0c481bde4227ce0d2adc648145b0fd1aa7845 (patch)
treec8aa9ab0de5d2cf77c7a23c078c325af46248a8b /.gitignore
parentb8ebd23f6df8317a2b091335640ddd89de8cc55b (diff)
parent79fa6126d766ae109c16746d1b6aae02c620a743 (diff)
Merge pull request #304 from MyIgel/master
.gitignore improvements
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore20
1 files changed, 17 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index f0e37b9c..febc6812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,22 @@
+# Generic cache files
+*~
+.~*
+*.tmp
+*.temp
+*.lock
+*.DS_Store
+.*.swp
+*.out
+Thumbs.db
.project
.buildpath
.settings
-.*.swp
_vimrc_local.vim
.sass-cache
-config/config.php
-test/coverage
+
+# PHPstorm config
+/.idea/
+
+# Project files
+/config/config.php
+/test/coverage