diff --git a/gitconfig b/gitconfig
index 461910a..b195580 100644
--- a/gitconfig
+++ b/gitconfig
@@ -36,3 +36,7 @@
 [custom "serverbranch"]
 	remote = origin
 	branch = master
+[diff]
+	tool = vimdiff
+[difftool]
+	prompt = false