From 3422e7aace62f888ee801bf9ec80561f6fe7f20c Mon Sep 17 00:00:00 2001
From: Ruben Beltran del Rio <ruben@unlimited.pizza>
Date: Wed, 11 Nov 2020 12:37:51 +0100
Subject: Set rebase to false on pull from git

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

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 2f7f713..e60d8a9 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,5 +8,7 @@
 	diff = auto
 [push]
 	default = simple
+[pull]
+  rebase = false
 [commit]
 	gpgsign = true
-- 
cgit