X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/37dfb719b94f10e813aacd0ee2f26207c3e6e91c..652ff1add948209b4d55f461b04c5d54d1d8ad7b:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 47fa392..8dd1f90 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -12,6 +12,9 @@
 	email = mdw@distorted.org.uk
 	signingkey = @releasekey@
 
+[annex]
+	sshcaching = false
+
 [merge]
 	summary = true
 	tool = emerge
@@ -34,6 +37,9 @@
 [rebase]
 	autosquash = true
 
+[push]
+	default = matching
+
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
 
@@ -121,4 +127,7 @@
 
 [gui]
 	fontui = -family Sans -size 10
-	fontdiff = -family MiscFixed6x13 -size 10
+	fontdiff = -family Fixed -size 13
+
+[http]
+	cookiefile = @home@/.gitcookies