From 896a952d8715ec7b6d6de907270192af57200fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergiolain11@gmail.com>
Date: Sun, 19 Nov 2023 12:46:14 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(gitconfig):=20added=20merge=20?=
 =?UTF-8?q?option=20by=20default=20when=20pulling?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/.gitconfig b/.gitconfig
index ca0ed678..9a052718 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -29,6 +29,8 @@
   blame = diff-so-fancy | less --tabs=4 -RFX
 [diff]
   colorMoved = default
+[pull]
+	rebase = false
 [commit]
 	gpgsign = true
 [gpg]