From f5a74e3f03e376699bdc32bdec4d505e01f18642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Thu, 6 May 2021 01:37:28 +0200
Subject: [PATCH] change merge-strategy

---
 .gitconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 866b979..b3881f9 100755
--- a/.gitconfig
+++ b/.gitconfig
@@ -48,5 +48,3 @@
     path = ~/.gitconfig_local
 [status]
 	submodulesummary = 1
-[pull]
-	rebase = true