mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-02-20 03:02:29 +01:00
Avoid this annoying message when upgrading :
« Type Y to update oh-my-zsh: Y Upgrading Oh My Zsh Cannot pull with rebase: You have unstaged changes. Please commit or stash them. There was an error updating. Try again later? »
This commit is contained in:
parent
4131a59d1a
commit
4d0fd7ee20
1 changed files with 2 additions and 1 deletions
|
|
@ -1,5 +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"
|
||||||
|
git stash
|
||||||
if git pull --rebase --stat origin master
|
if git pull --rebase --stat origin master
|
||||||
then
|
then
|
||||||
printf '\033[0;32m%s\033[0m\n' ' __ __ '
|
printf '\033[0;32m%s\033[0m\n' ' __ __ '
|
||||||
|
|
@ -13,4 +14,4 @@ then
|
||||||
else
|
else
|
||||||
printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
|
printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
|
||||||
fi
|
fi
|
||||||
|
git stash apply
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue