From b9242230564e5825a1db162da49bf6cb45408c11 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <alicia@omg.lol>
Date: Tue, 9 Aug 2022 16:28:51 +0100
Subject: [PATCH] Sets default merge strategy in .gitconfig

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

diff --git a/configs/.gitconfig b/configs/.gitconfig
index dc77c2d..a31263f 100644
--- a/configs/.gitconfig
+++ b/configs/.gitconfig
@@ -7,6 +7,8 @@
 	username = lissy93
 [init]
 	defaultBranch = master
+[pull]
+	rebase = false
 [core]
 	editor = nvim
 	whitespace = fix,-indent-with-non-tab,trailing-space,cr-at-eol