linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-12 21:39:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
See https://github.com/ohmyzsh/ohmyzsh/pull/7172#issuecomment-592875226
This commit is contained in:
Marc Cornellà 2020-02-29 14:53:06 +01:00 committed by GitHub
parent 1689e9bb90
commit 14b4f62e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/upgrade.sh
View file

@ -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' ' __ __ '