X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=01c101b0b3c28d10c8fa2d7b0e155e29e86c2443;hb=b2ede285d36b7ee9e95f6431ad01705eaf8403ce;hp=f3e9e53122bb0173cf5368aa547d080d1005276a;hpb=5ea2262889dc3886579289b0d7205632bfea4bf2;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index f3e9e531..01c101b0 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,30 @@ 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
 
+# pnpm
+package-lock.json
+
+# Project specifics
+.eslintcache
 .history/
 .scannerwork
+*.bak
 lib
+reports/
+benchmarks/internal/results/