update git sync; rebase and use passed remote name

This commit is contained in:
2014-08-05 13:52:47 -07:00
parent e1c70bf425
commit a7d329344a

View File

@@ -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() {