From 7c8a3ac56da1a6a413b4a3e214bca2cee97225fb Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam@recursive.engineer>
Date: Mon, 17 Jun 2024 12:38:39 -0400
Subject: [PATCH] A few merge options for git.

---
 git/gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git/gitconfig b/git/gitconfig
index a6ecae4..8447daf 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -34,6 +34,11 @@
 	mergetool = vimdiff
 	tool = vimdiff
 
+	# Merge commit setup
+	log = 50
+	branchdesc = true
+	suppressDest=
+
 [push]
 	default = upstream