X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/755f66215397cfe2e1886ae4170be4cfc48b3e24..0612a9149d46df422e11410d8ada66b78d3fe5d3:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 731bbba..c642c13 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -5,12 +5,16 @@
 	filemode = true
 	excludesfile = @profile@/git/gitignore
 	attributesfile = @profile@/git/attributes
+	whitespace = trailing-space,space-before-tab,indent-with-non-tab
 
 [user]
 	name = Mark Wooding
 	email = mdw@distorted.org.uk
 	signingkey = @releasekey@
 
+[annex]
+	sshcaching = false
+
 [merge]
 	summary = true
 	tool = emerge
@@ -33,6 +37,9 @@
 [rebase]
 	autosquash = true
 
+[push]
+	default = matching
+
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
 
@@ -120,4 +127,4 @@
 
 [gui]
 	fontui = -family Sans -size 10
-	fontdiff = -family MiscFixed6x13 -size 10
+	fontdiff = -family Fixed -size 13