Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index b80bf215f077066f93a9afcf5e8c679c5d5b9a65..2bbe46482054ca90bd6f2756ae1f07dc1bb85dad 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -12,9 +12,13 @@
        email = mdw@distorted.org.uk
        signingkey = @releasekey@
 
+[annex]
+       sshcaching = false
+
 [merge]
        summary = true
        tool = emerge
+       conflictStyle = diff3
 
 [mergetool "emerge"]
        path = emerge-hack
@@ -30,12 +34,15 @@
 [log]
        date = rfc
        decorate = true
+       follow = true
+       mailmap = true
 
 [rebase]
        autosquash = true
 
 [push]
        default = matching
+       followTags = true
 
 [format]
        headers = "Organization: Straylight/Edgeware\n"
@@ -71,6 +78,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"
@@ -125,3 +137,6 @@
 [gui]
        fontui = -family Sans -size 10
        fontdiff = -family Fixed -size 13
+
+[http]
+       cookiefile = @home@/.gitcookies