updater: fix --autostash argument. Works for git > 1.7.1

See https://github.com/ohmyzsh/ohmyzsh/pull/7172#issuecomment-592875226
6 years ago · 14b4f62e65
parent 1689e9bb90
commit 14b4f62e65
1 changed files with 1 additions and 1 deletions
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@ -38,7 +38,7 @@ if [ -n "$remote" ]; then
 fi

 printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
-if git pull --rebase --autostash --stat origin master
+if git -c rebase.autoStash=true pull --rebase --stat origin master
 then
  printf '%s' "$GREEN"
  printf '%s\n' '         __                                     __   '