X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a31466426f83569233d628c32eee5c84b2e5fabd..95185ca59af3f112b2a6245bae9f4c3526276370:/.gitconfig

diff --git a/.gitconfig b/.gitconfig
index 95f87b3..a3bf34d 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]
@@ -29,9 +31,14 @@
 	diff = auto
 	interactive = auto
 	status = auto
+	ui = auto
 [url "git+ssh://git.debian.org/git/"]
 	insteadOf = alioth:
 [url "git+ssh://git.madduck.net/srv/git/git.madduck.net/"]
 	insteadOf = madduck:
 [push]
 	default = matching
+[sendemail]
+	confirm = auto
+[help]
+	autocorrect = 5