diff --git a/functions/update-omz b/functions/update-omz index 3a24330f..3302d4b8 100644 --- a/functions/update-omz +++ b/functions/update-omz @@ -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 $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then +if git pull --rebase $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then zstyle -t ':omz:function:update-omz' color && printf "$FG[blue]" printf 'Hooray! oh-my-zsh is up-to-date :)\n' else