X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/7dc35f04d58b4b8d26dfadad6fd3967fb2463475..56c3a7e735236be7ff43f95fe1a001f5245cdd81:/gitconfig

diff --git a/gitconfig b/gitconfig
index 4064ae9..4d8eb77 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,6 +7,10 @@
 
 [merge]
 	summary = true
+	tool = emerge
+
+[mergetool "emerge"]
+	path = emerge-hack
 
 [diff]
 	renames = copies
@@ -46,3 +50,15 @@
 			--no-chain-reply-to \
 			--no-signed-off-by-cc \
 			--to"
+
+[stgit]
+	autoresolved = yes
+	smtpdelay = 0
+
+[mail "alias"]
+	git = git@vger.kernel.org
+	mdw = mdw@distorted.org.uk
+
+[gui]
+	fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
+	fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0