Refine .gitignore

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

diff --git a/.gitignore b/.gitignore
index 8cf99a8db82658edd4a2ccfa610cfdddb5738464..edec4c70849a4ee012c78ca4af8e01cf7585b7e9 100644 (file)
--- 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