From c5ec5daca09f92463767ba968fcfad9a19669272 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Mon, 20 Jul 2020 16:44:39 -0400
Subject: [PATCH] Git: automatically merge pulls

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index b73b7eb..285dea3 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -47,3 +47,5 @@
     s = status
     su = submodule update --init --recursive
     w = clean -fdx
+[pull]
+	rebase = false