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

diff --git a/.gitignore b/.gitignore
index 8cf99a8d..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