X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/da0af0a924191ca46cbbdfe94e8f6bcf777a20dc..956286a32c692c0d42db6b2dbcfc00d645823327:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index b80bf21..1dbc92b 100644
--- 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
@@ -36,6 +40,7 @@
 
 [push]
 	default = matching
+	followTags = true
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
@@ -71,6 +76,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 +135,6 @@
 [gui]
 	fontui = -family Sans -size 10
 	fontdiff = -family Fixed -size 13
+
+[http]
+	cookiefile = @home@/.gitcookies