added git ffr expressed ffo in terms of ffr

2014-04-13 23:21:40 -07:00 · 2014-04-13 23:21:40 -07:00 · dcd1cc3b23
commit dcd1cc3b23
parent e84668c75a
1 changed files with 2 additions and 1 deletions
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@ -6,7 +6,8 @@
 	# Clone a repository including all submodules
 	c = clone --recursive
        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
 	# Commit all changes
 	ca = !git add -A && git commit -av