From dcd1cc3b237e6ff2c7e4284b663281f315a15096 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sun, 13 Apr 2014 23:21:40 -0700
Subject: [PATCH] added git ffr expressed ffo in terms of ffr

---
 dotfiles/gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 3afd095b..0019c48c 100644
--- 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