diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 25b2de27a..4ed78ba34 100644
--- 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' '         __                                     __   '