From d6fd5a919e3402e097b9832b623b8ebed779b988 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 4 Oct 2018 18:20:52 +0100
Subject: pull-rebase-preserve!

---
 .gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index c28c1df..6e447cd 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -19,7 +19,7 @@
 [push]
 	default = tracking
 [pull]
-        rebase = true
+        rebase = preserve
 [diff]
         mnemonicprefix = true
         renames = copies
-- 
cgit v1.2.3