Merge 1cda742727 into 4fec0a46e7

2018-04-17 21:09:52 +00:00 · 2018-04-17 21:09:52 +00:00 · 5efed39b0a
parent 4fec0a46e7 1cda742727
commit 5efed39b0a
1 changed files with 1 additions and 1 deletions
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@ -22,7 +22,7 @@ fi

 printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
 cd "$ZSH"
-if git pull --rebase --stat origin master
+if git fetch origin && git rebase --autostash --stat origin/master
 then
  printf '%s' "$GREEN"
  printf '%s\n' '         __                                     __   '