From 31dbb4591bd9ec0e5c4503ccbac6fe3bfc5abb9b Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Fri, 14 Dec 2012 12:06:51 -0500
Subject: [PATCH] shorten pullff command

---
 .gitconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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