From: Ruben Beltran del Rio <redacted>
Date: Wed, 11 Nov 2020 11:37:51 +0000 (+0100)
Subject: Set rebase to false on pull from git
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/3422e7aace62f888ee801bf9ec80561f6fe7f20c?ds=sidebyside

Set rebase to false on pull from git
---

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