X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=d014f1b3a8032abb61dabb3f3ba3b85fe29debf1;hb=HEAD;hp=2e2848ad7a6cf6c1378b3b30b6923f93185a563b;hpb=ccd3ada6c3dd16a882523f9721d16f38e6a73cac;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 2e2848ad..9f9e3aa7 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,17 +50,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
 
-.history/
+# pnpm
+package-lock.json
+
+# Project specifics
+.eslintcache
 .scannerwork
+*.bak
 lib
+dist
+tmp
+.history/
+reports/
+benchmark-report.json