w33ble/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update git sync; rebase and use passed remote name

Browse Source
This commit is contained in:
Joe Fleming
2014-08-05 13:52:47 -07:00
parent e1c70bf425
commit a7d329344a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git/githelpers
View File

@@ -44,8 +44,8 @@ sync_to_remote() {
REMOTE=$1 REMOTE=$1
: ${REMOTE:="upstream"} : ${REMOTE:="upstream"}
BRANCH=`git rev-parse --abbrev-ref HEAD` BRANCH=`git rev-parse --abbrev-ref HEAD`
git fetch upstream echo "Synching with ${REMOTE}"
git merge --ff-only ${REMOTE}/${BRANCH}; git fetch ${REMOTE} && git rebase ${REMOTE}/${BRANCH};
} }
get_pr() { get_pr() {