gitconfig: more tweaks

diff --git a/.gitconfig b/.gitconfig
index 4865d5336094311aa48595722ac0827352c784e5..c4b0270c49f7e28ec15c507fedb3cab4d22ea291 100644 (file)
--- 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