el/dot-emacs.el: Better fontification for Ediff.

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 47fa3920869aaed796ee3c3ed62d7b7eda91ea54..8dd1f90953ed122aec2c2fd64173157825656c24 100644 (file)
--- 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