`14b4f62e65b3d94c275ea8892f252deae9ce619a`

Author: Marc Cornellà <marc.cornella@live.com>
Committer: GitHub <noreply@github.com>
Date: 2020-02-29 13:53 UTC

Message

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

See https://github.com/ohmyzsh/ohmyzsh/pull/7172#issuecomment-592875226

Diff

 1diff --git a/tools/upgrade.sh b/tools/upgrade.sh
 2index 0dc84e2146efee24a3326d58f2f2ac1777a9fa66..9ecaed2ef80bfd3b5709b143da999dd899ade1ad 100644
 3--- a/tools/upgrade.sh
 4+++ b/tools/upgrade.sh
 5@@ -38,7 +38,7 @@ if [ -n "$remote" ]; then
 6 fi
 7 
 8 printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
 9-if git pull --rebase --autostash --stat origin master
10+if git -c rebase.autoStash=true pull --rebase --stat origin master
11 then
12   printf '%s' "$GREEN"
13   printf '%s\n' '         __                                     __   '