X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=99b9a2c2fef7c56ee9b60e9c04cfccd687666eb0;hb=d35f64e01abca6e969435f5367c55fe9760beffd;hp=73020ee6dcbc68b9d016a6410738e33e595db140;hpb=660940b0fcdbafb80d3c01684b668f55980bfa67;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 73020ee6..99b9a2c2 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,26 @@ 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
 
+# Project specifics
+.eslintcache
 .history/
-
+.scannerwork
+*.bak
 lib
+reports