X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=a1a9fd96930e6b04e312da11c827fb72fa9ed657;hb=18cac48541d1b6065a113c729ee83f83366f335c;hp=d3b8590e5d1dbce8eda34cc04c6e5a298eea2acc;hpb=2c1331d62eb8900f4c8c3b6bd7afd4f943d187bc;p=poolifier.git

diff --git a/.gitignore b/.gitignore
index d3b8590e..a1a9fd96 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
@@ -53,6 +68,10 @@ build/config.gypi
 .DS_Store
 
 # Project specifics
+.eslintcache
 .history/
 .scannerwork
+*.bak
 lib
+reports/
+benchmarks/internal/results/