|
|
@ -23,10 +23,10 @@ zstyle -t ':omz:function:update-omz' upstream '_upstream'
|
|
|
|
|
|
|
|
|
|
|
|
if git pull $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then
|
|
|
|
if git pull $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then
|
|
|
|
zstyle -t ':omz:function:update-omz' color && printf "$FG[blue]"
|
|
|
|
zstyle -t ':omz:function:update-omz' color && printf "$FG[blue]"
|
|
|
|
printf 'Hooray! oh-my-zsh is up-to-date :)'
|
|
|
|
printf 'Hooray! oh-my-zsh is up-to-date :)\n'
|
|
|
|
else
|
|
|
|
else
|
|
|
|
zstyle -t ':omz:function:update-omz' color && printf "$FG[red]"
|
|
|
|
zstyle -t ':omz:function:update-omz' color && printf "$FG[red]"
|
|
|
|
printf 'Oh no! There was an error updating oh-my-zsh :('
|
|
|
|
printf 'Oh no! There was an error updating oh-my-zsh :(\n'
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
cd "$current_path"
|
|
|
|
cd "$current_path"
|
|
|
|