diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 97d6542..4ee1ba7 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -84,8 +84,14 @@
 [diff]
     renames = copies
     mnemonicprefix = true
+[difftool]
+    prompt = false
+[apply]
+    # do not warn about missing whitespace at EOF
+    whitespace = nowarn
 [core]
     excludesfile = ~/.gitignore_global
     pager = less -FXRS -x2
+    editor = vim
 [rerere]
 	enabled = false