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

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 731bbbac04471ad1e75a27ea6f6ef8bd9655e4d5..8dd1f90953ed122aec2c2fd64173157825656c24 100644 (file)
--- 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,7 @@
 
 [gui]
        fontui = -family Sans -size 10
-       fontdiff = -family MiscFixed6x13 -size 10
+       fontdiff = -family Fixed -size 13
+
+[http]
+       cookiefile = @home@/.gitcookies