added git ffr expressed ffo in terms of ffr

This commit is contained in:
Ivan Malison 2014-04-13 23:21:40 -07:00
parent e84668c75a
commit dcd1cc3b23

View File

@ -6,7 +6,8 @@
# Clone a repository including all submodules # Clone a repository including all submodules
c = clone --recursive c = clone --recursive
ff = merge --ff-only ff = merge --ff-only
ffo = "!ffo() { git fetch origin && git ff origin/$(git which-branch) && git suir; }; ffo" ffr = "!ffr() { git fetch $1 && git ff origin/$(git which-branch) && git suir; }; ffr"
ffo = !git ffr origin
cam = commit -am cam = commit -am
# Commit all changes # Commit all changes
ca = !git add -A && git commit -av ca = !git add -A && git commit -av