From a7d329344a7f22ee32bcca06fcf336ef92e53dff Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Tue, 5 Aug 2014 13:52:47 -0700
Subject: [PATCH] update git sync; rebase and use passed remote name

---
 git/githelpers | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git/githelpers b/git/githelpers
index 8768108..75df5cc 100644
--- a/git/githelpers
+++ b/git/githelpers
@@ -44,8 +44,8 @@ sync_to_remote() {
     REMOTE=$1
     : ${REMOTE:="upstream"}
     BRANCH=`git rev-parse --abbrev-ref HEAD`
-    git fetch upstream
-    git merge --ff-only ${REMOTE}/${BRANCH};
+    echo "Synching with ${REMOTE}"
+    git fetch ${REMOTE} && git rebase ${REMOTE}/${BRANCH};
 }
 
 get_pr() {