adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Break out pull --rebase into fetch; rebase --autostash

Browse Source 
...this should make auto-updating a little less of a perpetual fail for those
of us with a tendency to tinker.

Not that anyone who uses zsh and oh-my-zsh would have such a tendency :)
This commit is contained in:
Chris Weyl 2014-04-07 20:17:59 -07:00
parent f8f01262ab
commit 1cda742727
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/upgrade.sh
View File

@ -1,6 +1,6 @@
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh" printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd "$ZSH" cd "$ZSH"
if git pull --rebase --stat origin master if git fetch origin && git rebase --autostash --stat origin/master
then then
printf '\033[0;32m%s\033[0m\n' ' __ __ ' printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '