gitconfig updates

2013-02-06 10:26:10 -06:00
parent f233096c60
commit 6377243b5a
1 changed files with 6 additions and 0 deletions
--- 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