From dcba6f27b2af50231270a09908bf287ab8104454 Mon Sep 17 00:00:00 2001
From: Blaise Thompson <blaise@untzag.com>
Date: Wed, 3 Feb 2021 17:10:28 -0600
Subject: 2021-02-03 17:10

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

diff --git a/git/gitconfig b/git/gitconfig
index 7175704..a8a6365 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -11,3 +11,5 @@
 	rebase = false
 [init]
 	templateDir = /home/blaise/.git-template
+[branch]
+	autosetupmerge = true
-- 
cgit v1.2.3