X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/a67800787383e8f8b07a6fad057311a397d722c2..d281a650f22a762b59befca3442f28990ac16cee:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 25f46cd..2bbe464 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
@@ -30,10 +34,16 @@
 [log]
 	date = rfc
 	decorate = true
+	follow = true
+	mailmap = true
 
 [rebase]
 	autosquash = true
 
+[push]
+	default = matching
+	followTags = true
+
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
 
@@ -68,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"
@@ -122,3 +137,6 @@
 [gui]
 	fontui = -family Sans -size 10
 	fontdiff = -family Fixed -size 13
+
+[http]
+	cookiefile = @home@/.gitcookies