setup, dot/xinitrc: Provisionally prefer Emacs 24 over 23.

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 25f46cd..b682839 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"
 
@@ -68,6 +74,11 @@
 [color "grep"]
        external = --color=always
 
+[pager]
+       log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+       show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+       diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+
 [alias]
        egrep = "grep -E"
        patch = "format-patch -o p -s"
@@ -122,3 +133,6 @@
 [gui]
        fontui = -family Sans -size 10
        fontdiff = -family Fixed -size 13
+
+[http]
+       cookiefile = @home@/.gitcookies