X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/1b239a706933a7252f4a737db92b70f294320d8f..d57a718ee1f65705bfdf5f3ff16b689add4caae2:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 8dd1f90..1dbc92b 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
@@ -39,6 +40,7 @@
 
 [push]
 	default = matching
+	followTags = true
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
@@ -74,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"