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

diff --git a/.gitignore b/.gitignore
index 8ddca4be..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
@@ -56,4 +71,6 @@ build/config.gypi
 .eslintcache
 .history/
 .scannerwork
+*.bak
 lib
+reports