|
|
|
@ -21,7 +21,7 @@ cd $OMZ_HOME
|
|
|
|
|
zstyle -t ':omz:function:update-omz' auto-commit || local nocommit='--no-commit'
|
|
|
|
|
zstyle -t ':omz:function:update-omz' upstream '_upstream'
|
|
|
|
|
|
|
|
|
|
if git pull --rebase $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then
|
|
|
|
|
if git pull --rebase $nocommit --strategy=recursive -X ours ${_upstream:-origin} master && git submodule update --recursive; then
|
|
|
|
|
zstyle -t ':omz:function:update-omz' color && printf "$FG[blue]"
|
|
|
|
|
printf 'Hooray! oh-my-zsh is up-to-date :)\n'
|
|
|
|
|
else
|
|
|
|
|