From 59b83913155f4623289cfb37955be91cc40f81c3 Mon Sep 17 00:00:00 2001
From: daniel <github@dbauer.me>
Date: Sun, 19 Mar 2023 13:14:17 +0100
Subject: [PATCH] git pull merge automatically

---
 profiles/base/.gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/profiles/base/.gitconfig b/profiles/base/.gitconfig
index aaefa21..aeca41b 100644
--- a/profiles/base/.gitconfig
+++ b/profiles/base/.gitconfig
@@ -38,7 +38,6 @@
 	colorMoved = True
 [commit]
 	verbose = true
-
 [color "status"]
 	added = green
 	changed = red
@@ -50,3 +49,5 @@
 	defaultBranch = main
 [include]
 	path = ~/.gitconfig.local
+[pull]
+	rebase = false