diff --git a/install.sh b/install.sh
index f24543b..26c8f51 100755
--- a/install.sh
+++ b/install.sh
@@ -23,9 +23,13 @@ function setup_git {
     # set up some git stuff
     git config --global pull.ff only
     git config --global merge.ff only
+    git config --global merge.tool vimdiff
 
     git config --global rebase.autosquash true
     git config --global rebase.autostash true
+
+    git config --global log.abbrevcommit yes
+
 }
 
 function install_vimrc {