X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/5e504acc7931c1abf3bb487d4137158ba4196f5e..b617a6a0d5df3b7dbb86a72c6cb0b875ac396810:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index c642c13..0bc63d1 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,15 +34,21 @@
 [log]
 	date = rfc
 	decorate = true
+	follow = true
+	mailmap = true
 
 [rebase]
 	autosquash = true
 
 [push]
 	default = matching
+	followTags = true
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
+	coverletter = auto
+	thread = shallow
+	signature = "[mdw]"
 
 [color]
 	ui = auto
@@ -74,9 +81,14 @@
 [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"
+	patches = "format-patch --full-index"
 	graph = "log --pretty=oneline --abbrev-commit --graph"
 	release = !"sh -e -c ' \
 		[ $# -gt 0 ] || { \
@@ -87,11 +99,6 @@
 	amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
 	spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
 		xargs -0r space -cv' spaces"
-	mailto = "send-email \
-			--quiet \
-			--no-chain-reply-to \
-			--no-signed-off-by-cc \
-			--to"
 	files = "ls-files --exclude-standard"
 	unstg = !"sh -e -c ' \
 		: ${GIT_DIR=$(git rev-parse --git-dir)}; \
@@ -122,9 +129,13 @@
 	aliasesfile = @profile@/dot/mailrc
 	aliasfiletype = mailrc
 	chainreplyto = no
+	thread = no
 	signedoffbycc = yes
 	suppresscc = self
 
 [gui]
 	fontui = -family Sans -size 10
 	fontdiff = -family Fixed -size 13
+
+[http]
+	cookiefile = @home@/.gitcookies