From: Mike Frysinger <vapier@google.com>
Date: Tue, 6 Oct 2026 17:38:40 +0000 (-0400)
Subject: gitconfig: more tweaks
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;p=home.git

gitconfig: more tweaks
---

diff --git a/.gitconfig b/.gitconfig
index 4865d53..c4b0270 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,6 +5,7 @@
 
 [advice]
 	detachedHead = false
+	mergeConflict = false
 	skippedCherryPicks = false
 
 [core]
@@ -44,6 +45,9 @@
 	# https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
 	version = 2
 
+[protocol "sso"]
+	allow = always
+
 [pull]
 	ff = only