shorten pullff command

2012-12-14 12:06:51 -05:00
parent e54716ab50
commit 31dbb4591b
1 changed files with 3 additions and 1 deletions
--- 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