From 7a30c1a8a26b0282de3f21ce25b6024c8d88e97b Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@meatballhat.com>
Date: Sun, 22 Nov 2020 13:49:41 -0500
Subject: [PATCH] Explicitly set git pull.rebase=false

---
 gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gitconfig b/gitconfig
index 0835129..6f529d5 100644
--- a/gitconfig
+++ b/gitconfig
@@ -31,6 +31,9 @@
 [push]
 	default = current
 
+[pull]
+	rebase = false
+
 [fetch]
 	prune = true