X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=99b9a2c2fef7c56ee9b60e9c04cfccd687666eb0;hb=4b3d870b66d4e955b28c61c4d62dec1a33f54cb5;hp=93018812f08b715e0a59557fcf120d3ae0cdccd1;hpb=776419ad922294f825dbaf8d1b55595d3706d102;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index 93018812..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,14 +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