X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=.gitignore;h=99b9a2c2fef7c56ee9b60e9c04cfccd687666eb0;hb=ed1ecf09c599769ed61771ec25d71c39c19ba70b;hp=8cf99a8db82658edd4a2ccfa610cfdddb5738464;hpb=3ffada528b1ca9f062534bf09dd9772d1b2d4673;p=poolifier.git

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