X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=99b9a2c2fef7c56ee9b60e9c04cfccd687666eb0;hb=e4bc7a498d48e2773b2e68fd4ffcaf4d328d5a0b;hp=2ac23b4dcd7693112a53537111e23655dcb1603f;hpb=3e460d6d082e6b398aa9cf58694ea5ef83d6571c;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 2ac23b4d..99b9a2c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,18 @@
+### 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
@@ -36,10 +51,26 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 
-# Project specifics
-.vscode/
+# VisualStudioCode
+.vscode/*
+!.vscode/extensions.json
+!.vscode/launch.json
+!.vscode/settings.json
+!.vscode/tasks.json
+
+# Intellij
+/.idea
+/outputs
+/docker/mongo
+build/config.gypi
 
 # Mac
-.DS_Store/
+.DS_Store
 
-.history/
\ No newline at end of file
+# Project specifics
+.eslintcache
+.history/
+.scannerwork
+*.bak
+lib
+reports