From efd8a8682e2ad9e607708251ad2ed7b24d502c08 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Tue, 11 May 2021 21:42:25 +0100
Subject: [PATCH] .gitignore: git ignore git

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

diff --git a/.gitignore b/.gitignore
index 1809889..69be1d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,23 @@
+# 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
+
 # Compiled Lua sources
 luac.out