email = mdw@distorted.org.uk
signingkey = @releasekey@
+[annex]
+ sshcaching = false
+
[merge]
summary = true
tool = emerge
+ conflictStyle = diff3
[mergetool "emerge"]
path = emerge-hack
[log]
date = rfc
decorate = true
+ follow = true
+ mailmap = true
[rebase]
autosquash = true
+[push]
+ default = matching
+ followTags = true
+
[format]
headers = "Organization: Straylight/Edgeware\n"
[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"
[gui]
fontui = -family Sans -size 10
fontdiff = -family Fixed -size 13
+
+[http]
+ cookiefile = @home@/.gitcookies