From 70c581dc19f5ff114931381d91d37de4a1bc4ffe Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 1 Oct 2021 01:33:07 -0700
Subject: [PATCH] git: add no rebase setting to always automatically merge when
 pulling

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

diff --git a/.gitconfig b/.gitconfig
index 308b64c..5b83e8a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,7 @@
 [credential]
 	helper = store
+[pull]
+   rebase = false
 [user]
 	email = blakelysnorth@gmail.com
 	name = PowerUser64