From 08142409f8bcc7c32f5028c7516e0aa340706e28 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Tue, 31 Mar 2020 09:58:45 -0700
Subject: [PATCH] Set git pull to merge, not rebase.

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

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 6d9d39d..e1906fa 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -67,3 +67,5 @@
 	prompt = false
 [include]
 	path = ~/.gitconfig.local
+[pull]
+	rebase = false