shorten pullff command

This commit is contained in:
Michael Campagnaro 2012-12-14 12:06:51 -05:00
parent e54716ab50
commit 31dbb4591b

View File

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