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

diff --git a/.gitignore b/.gitignore
index d3b8590e..edec4c70 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,8 @@ build/config.gypi
 .DS_Store
 
 # Project specifics
+.eslintcache
 .history/
 .scannerwork
 lib
+*.bak