From 9662e628fba032ab73dd4f2b90ff411443f4cc4a Mon Sep 17 00:00:00 2001
From: Ben Morrison <ben@gbmor.dev>
Date: Mon, 15 Jun 2020 03:47:53 -0400
Subject: git was complaining about this

---
 .config/git/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.config/git/config b/.config/git/config
index 0a5c940..1c9218b 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -17,3 +17,5 @@
 	editor = interactive-rebase-tool
 [credential]
 	helper = cache --timeout 3600
+[pull]
+	rebase = false
-- 
cgit 1.4.1