rebase when merging

13 years ago · 2c73f54b2a
parent 4fe4155ecc
commit 2c73f54b2a
1 changed files with 1 additions and 1 deletions
--- 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