From 69768c5694beafeded56778fab285fdbe05b201a Mon Sep 17 00:00:00 2001
From: Dan Anglin <daangling@gmail.com>
Date: Mon, 21 Oct 2024 08:47:34 +0100
Subject: [PATCH] fix(git): update config

---
 templates/git/config.gotmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/git/config.gotmpl b/templates/git/config.gotmpl
index 30b2bc4..d3d4e12 100644
--- a/templates/git/config.gotmpl
+++ b/templates/git/config.gotmpl
@@ -11,6 +11,7 @@
   sw = switch
   rb = rebase
   fh = !sh -c 'git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main'
+  mg = merge
 [commit]
   gpgsign = {{ .Git.GpgSign }}
   template = {{ env "XDG_CONFIG_HOME" | printf "%s/git/message" }}