diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-02-29 14:53:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-29 14:53:06 +0100 |
| commit | 14b4f62e65b3d94c275ea8892f252deae9ce619a (patch) | |
| tree | 3a480b86b4c04c9beeeebf71184a41ed21a04340 /tools/upgrade.sh | |
| parent | 1689e9bb907ab184d7418dd88bc2639a794c916d (diff) | |
| download | zsh-14b4f62e65b3d94c275ea8892f252deae9ce619a.tar.gz zsh-14b4f62e65b3d94c275ea8892f252deae9ce619a.tar.bz2 zsh-14b4f62e65b3d94c275ea8892f252deae9ce619a.zip | |
updater: fix --autostash argument. Works for git > 1.7.1
See https://github.com/ohmyzsh/ohmyzsh/pull/7172#issuecomment-592875226
Diffstat (limited to 'tools/upgrade.sh')
| -rw-r--r-- | tools/upgrade.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 0dc84e214..9ecaed2ef 100644 --- 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' ' __ __ ' |