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

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 77976f902c823dc81a5eccc028b4c1a2b61ccef3..8dd1f90953ed122aec2c2fd64173157825656c24 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -4,12 +4,17 @@
 [core]
        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
@@ -19,10 +24,11 @@
 
 [diff]
        renames = copies
+       renameLimit = 1024
        wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
-       xfuncname = "^\\s*\\(def.*$"
+       xfuncname = "^((\\(|\\s*\\(def).*$)"
 
 [log]
        date = rfc
@@ -31,6 +37,9 @@
 [rebase]
        autosquash = true
 
+[push]
+       default = matching
+
 [format]
        headers = "Organization: Straylight/Edgeware\n"
 
@@ -98,6 +107,7 @@
 
 [rerere]
        enabled = yes
+       autoupdate = yes
 
 [stgit]
        autoresolved = yes
@@ -117,4 +127,7 @@
 
 [gui]
        fontui = -family Sans -size 10
-       fontdiff = -family MiscFixed6x13 -size 10
+       fontdiff = -family Fixed -size 13
+
+[http]
+       cookiefile = @home@/.gitcookies