X-Git-Url: https://git.madduck.net/etc/git.git/blobdiff_plain/a31466426f83569233d628c32eee5c84b2e5fabd..24d82f05b3040d98099163eb12c261466e81169b:/.gitconfig?ds=sidebyside

diff --git a/.gitconfig b/.gitconfig
index 95f87b3..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]
@@ -35,3 +37,5 @@
 	insteadOf = madduck:
 [push]
 	default = matching
+[sendemail]
+	confirm = auto