From 48bbb0b9f5e6865e5a38f814d21d7b50fdd5c786 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@google.com>
Date: Tue, 6 Oct 2026 13:38:40 -0400
Subject: [PATCH] gitconfig: more tweaks

---
 .gitconfig | 4 ++++
 1 file changed, 4 insertions(+)

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
 
-- 
2.47.3