linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-06-05 05:03:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 1cda742727 into be5bff2e86

Browse source
This commit is contained in:
Chris Weyl 2018-06-12 18:09:11 +00:00 • committed by GitHub
commit ee5de2dff3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/upgrade.sh
View file

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