X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/153bac3efb398f6e22bc95be7efde4ef57a50a1e..24d82f05b3040d98099163eb12c261466e81169b:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index dbb74a2..3cb2e85 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -22,6 +22,8 @@
 	autosetuprebase = remote
 [merge]
 	tool = vimdiff
+[diff]
+	tool = vimdiff
 [gui]
 	fontui = -family rotissansserif -size 10 -weight bold -slant roman -underline 0 -overstrike 0
 [color]
@@ -33,3 +35,7 @@
 	insteadOf = alioth:
 [url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
 	insteadOf = madduck:
+[push]
+	default = matching
+[sendemail]
+	confirm = auto