From 8dc6017b69e9f123d46d4ba103c0b9706266013e Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Mon, 25 May 2020 10:19:23 +0200
Subject: [PATCH] Default strategy for reconciling divergent branches

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

diff --git a/.gitconfig b/.gitconfig
index c575a36..f83cce9 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -63,3 +63,5 @@
 
 [url "git://bitbucket.org/"]
 	insteadOf = "bitbucket:"
+[pull]
+	rebase = false