From 5e5aa0b9f9b0b19472af001ea07d1c49b230dac6 Mon Sep 17 00:00:00 2001
From: Urbain Vaes <urbain@vaes.uk>
Date: Fri, 19 Jun 2020 17:17:00 +0200
Subject: Add git pull configuration

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

(limited to 'git/.gitconfig')

diff --git a/git/.gitconfig b/git/.gitconfig
index 0e7df50..738c719 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,3 +19,5 @@
 	default = simple
 [merge]
 	ff = true
+[pull]
+	rebase = false
-- 
cgit v1.2.3