X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/301d94a9158490882f3916edc5d6584693250d31..9cc4ff1354bdf73f44df3ba4cb699be92906b9fc:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 8dd1f90..4c0fa8a 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -18,6 +18,7 @@
 [merge]
 	summary = true
 	tool = emerge
+	conflictStyle = diff3
 
 [mergetool "emerge"]
 	path = emerge-hack
@@ -33,12 +34,14 @@
 [log]
 	date = rfc
 	decorate = true
+	mailmap = true
 
 [rebase]
 	autosquash = true
 
 [push]
 	default = matching
+	followTags = true
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
@@ -74,6 +77,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"