From 1d045865a43200f77a000e5e5cab860076dd015a Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 20 Jun 2020 15:42:47 +0100
Subject: [PATCH] Ensure git pulls aren't rebased automatically

---
 files/gitconfig.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/gitconfig.conf b/files/gitconfig.conf
index 0d674c0..f901de3 100644
--- a/files/gitconfig.conf
+++ b/files/gitconfig.conf
@@ -14,6 +14,9 @@
 [commit]
     verbose = true
 
+[pull]
+    rebase = false
+
 [alias]
     root = rev-parse --show-toplevel
     amend = commit --amend --no-edit