From 502622f2a2cfe77ffc29ca7fb4629a9bab233ee4 Mon Sep 17 00:00:00 2001
From: Adam Hovorka <adamhovorka@gmail.com>
Date: Fri, 12 Jun 2020 15:39:40 -0600
Subject: Add pull mode to gitconfig

---
 base/gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/gitconfig b/base/gitconfig
index 56fcb65..3db3b5a 100644
--- a/base/gitconfig
+++ b/base/gitconfig
@@ -24,7 +24,8 @@
   tool = vimdiff
 [push]
   default = simple
-#[pull]
+[pull]
+  rebase = false
 #  ff = only
 #[rerere]
 #  enabled = 1
-- 
cgit v1.2.3-70-g09d2