X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=92bdcf304e3059126e0d36db4facdfd814992bf7;hb=75b4765719cddf8bcb1b15c25ffc27359d908126;hp=3863e2ba767baf070749adf710cc323c0398800d;hpb=563a5516ab068729ce9d71c98dd0fe64b50ef0d1;p=e-mobility-charging-stations-simulator.git

diff --git a/.gitignore b/.gitignore
index 3863e2ba..92bdcf30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,28 @@
 # config
-src/assets/config.json
+src/assets/config*.json
+!src/assets/config-template.json
+src/scripts/scriptConfig.json
+src/assets/*tags*.json
+!src/assets/authorization-tags-template.json
+mikro-orm.config*.ts
+!mikro-orm.config-template.ts
 manifest.yml
 
+### Git ###
+# Created by git for backups. To disable backups in Git:
+# $ git config --global mergetool.keepBackup false
+*.orig
+
+# Created by git when using merge tools for conflicts
+*.BACKUP.*
+*.BASE.*
+*.LOCAL.*
+*.REMOTE.*
+*_BACKUP_*.txt
+*_BASE_*.txt
+*_LOCAL_*.txt
+*_REMOTE_*.txt
+
 # Logs
 logs
 *.log
@@ -40,6 +61,16 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 
+# Grunt usually compiles files inside this directory
+dist/
+
+# Grunt usually preprocesses files such as coffeescript, compass... inside the .tmp directory
+.tmp/
+
+# Grunt typescript cache
+.tscache/
+tscommand-*
+
 # temporary file
 tmp
 
@@ -69,3 +100,18 @@ build/config.gypi
 # System Files
 .DS_Store
 Thumbs.db
+
+# Winston
+*-audit.json
+
+# MTA
+*.mta
+mta_archives/
+
+*.bak
+.eslintcache
+temp/
+*.tar.gz
+performanceRecords.json
+performanceRecords.json.lock
+*.db