From b14656523088e77c103895baadc7f1573ff1f89b Mon Sep 17 00:00:00 2001
From: Johannes Löthberg <johannes@kyriasis.com>
Date: Mon, 27 Nov 2017 12:59:13 +0100
Subject: git/config: set pull.rebase to preserve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 git/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/git/config b/git/config
index ee78039..b4f6cb9 100644
--- a/git/config
+++ b/git/config
@@ -96,6 +96,9 @@
 [push]
 	default = simple
 
+[pull]
+	rebase = preserve
+
 [repack]
 	writebitmaps = true
 	autosquash = true
-- 
cgit v1.2.3-70-g09d2