From 1ed0c53a2a130ed78d44145f8c20e3921167152c Mon Sep 17 00:00:00 2001
From: PlexSheep <software@cscherr.de>
Date: Mon, 11 Sep 2023 23:09:02 +0200
Subject: [PATCH] git merge by default

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

diff --git a/.gitconfig b/.gitconfig
index 4ded71c..11e5278 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,5 @@
 	helper = store --file ~/.git-credentials
 [commit]
 	gpgsign = false
+[pull]
+	rebase = false