diff --git a/.gitconfig b/.gitconfig
index 12a78d7..d5ac6b0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,7 +20,7 @@
   re = remote
   ra = !git r --all
   ff = merge --ff-only
-  pullff = pull --ff-only
+  pff = pull --ff-only
   noff = merge --no-ff
   l = "!source ~/.githelpers && pretty_git_log"
   la = !git l --all
@@ -35,3 +35,5 @@
 
 [merge]
   tool = vimdiff
+[core]
+	editor = /usr/bin/vim