From 0043e59068a554fcc496cb48375b44134aba1401 Mon Sep 17 00:00:00 2001
From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com>
Date: Wed, 15 Dec 2021 10:15:04 -0600
Subject: [PATCH] Add default merge mode to gitconfig

Signed-off-by: Thomas A. Christensen II <25492070+MillironX@users.noreply.github.com>
---
 executable_dot_gitconfig.tmpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/executable_dot_gitconfig.tmpl b/executable_dot_gitconfig.tmpl
index b79eb05..885e01b 100644
--- a/executable_dot_gitconfig.tmpl
+++ b/executable_dot_gitconfig.tmpl
@@ -12,6 +12,8 @@
 	defaultBranch = master
 [github]
 	user = MillironX
+[pull]
+	rebase = false
 {{- if eq .chezmoi.osRelease.id "fedora" }}
 [diff]
 	tool = kdiff3