X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=a1a9fd96930e6b04e312da11c827fb72fa9ed657;hb=c9102ab445193a629e149365be9b3fca9edb2ed6;hp=6d8f90fba979bc7fd18b695cde1858278232c211;hpb=1eaa679e42a2a158b38e6fd615fd04b1bf6eb694;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 6d8f90fb..a1a9fd96 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,13 +51,27 @@ 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
 
+# Project specifics
+.eslintcache
 .history/
-
+.scannerwork
+*.bak
 lib
+reports/
+benchmarks/internal/results/