X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=d014f1b3a8032abb61dabb3f3ba3b85fe29debf1;hb=394676d15b59b7013b9d95889e47a4a49860b057;hp=6c68f3af62ef20a3d0c24af183c5652f2f4b1595;hpb=522eea0367c1381247471bc4393ae9c9de398120;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 6c68f3af..d014f1b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,17 @@
+# 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,11 +50,31 @@ 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
+# pnpm
+package-lock.json
+
+# Project specifics
+.eslintcache
+.scannerwork
+*.bak
+lib
+dist
+tmp
+.history/
+reports/