X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=404473ff6a0747e4ff8bd0926bea42b74cbe02e6;hb=5441aea6894a5031667db6447634fa5d97f69e36;hp=9b6244b79e602fc6d24b7865f27c188257627986;hpb=515e5da7461f84786a9b6acf859cf65a083e2f4c;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 9b6244b7..404473ff 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,16 +51,32 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 
-# Project specifics
+# 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
 
+# pnpm
+package-lock.json
+
+# Project specifics
+.eslintcache
 .history/
 .scannerwork
+*.bak
 lib
+dist
+tmp
+reports/
+benchmarks/internal/results/