diff --git a/.gitconfig b/.gitconfig
index 6330a84..ff1f126 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -50,5 +50,15 @@
 
 [core]
 	quotepath = false
+
 [push]
 	default = matching
+
+[difftool]
+	prompt = false
+
+[diff]
+	tool = vimdiff
+
+[mergetool "vimdiff"]
+	keepBackup = false