From d5fbab32bcb104438802a09294de7e36c38b9499 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sun, 9 Apr 2023 18:57:54 +0200
Subject: [PATCH] gitignore: add git entries

---
 .gitignore | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.gitignore b/.gitignore
index 10ee45c..0315d4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,23 @@ result
 .direnv
 .pre-commit-config.yaml
 .worktrees/
+
+# Created by https://www.toptal.com/developers/gitignore/api/git
+# Edit at https://www.toptal.com/developers/gitignore?templates=git
+
+### 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
+
+# End of https://www.toptal.com/developers/gitignore/api/git