From 8bd9d120477889179aff683c7f8e396bbbc77656 Mon Sep 17 00:00:00 2001
From: Ibrahim Muftee <ibrahim@muftee.net>
Date: Mon, 22 Apr 2024 21:08:10 -0500
Subject: fix(git): always merge when pulling

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

(limited to 'dot_gitconfig.tmpl')

diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 0498692..b896ca7 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -35,3 +35,5 @@
        helper =
        helper = !/usr/bin/gh auth git-credential
 {{ end -}}
+[pull]
+	rebase = false
-- 
cgit v1.2.3