From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Fri, 7 Oct 2022 15:20:29 +0000 (+0200)
Subject: Refine .gitignore
X-Git-Tag: v2.2.1~18
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=85ff0ff051cf39e2a7ce2de2e644330364ed6065;p=poolifier.git

Refine .gitignore

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---

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