From 87b06b87121cd86a774f1a35aebc5c3277796b90 Mon Sep 17 00:00:00 2001
From: Wryn Wagner <wagner.wryn@gmail.com>
Date: Tue, 21 Sep 2021 09:28:57 -0600
Subject: [PATCH] gitconfig merge conflict resolve

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

diff --git a/config/git/gitconfig b/config/git/gitconfig
index 37804bb..6a94fd0 100644
--- a/config/git/gitconfig
+++ b/config/git/gitconfig
@@ -19,3 +19,5 @@
 	branch = always
 [submodule]
 	recurse = true
+[alias]
+	serve = !git daemon --verbose --export-all --base-path=.git --reuseaddr --strict-paths .git/