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

feat: auto rebase on git bsync command

Browse Source
This commit is contained in:
Joe Fleming
2020-11-17 11:12:27 -07:00
parent a9ec765b5d
commit bc42a3f8ef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git/githelpers
View File

@@ -58,7 +58,7 @@ update_branch() {
git stash git stash
new_stash=$(git rev-parse -q --verify refs/stash) new_stash=$(git rev-parse -q --verify refs/stash)
# checkout branch and sync to remote, then come back # checkout branch and sync to remote, then come back
git checkout ${BRANCH} && git sync ${REMOTE} && git checkout - git checkout ${BRANCH} && git sync ${REMOTE} && git checkout - && git rebase ${BRANCH}
# if the stash added to the stack, pop it back off # if the stash added to the stack, pop it back off
[ "$old_stash" != "$new_stash" ] && git stash pop [ "$old_stash" != "$new_stash" ] && git stash pop
} }