adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set upgrade to look at upstream if it exists

Browse Source
This commit is contained in:
Bryan Tidwell 2016-11-13 20:21:40 -06:00
parent 62b0abdb6e
commit af912fc5d6
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

@ -22,7 +22,7 @@ fi
printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh" printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
cd "$ZSH" cd "$ZSH"
if git pull --rebase --stat origin master if [ -d .git/refs/upsteam ] git pull --rebase --stat upstream master || git pull --rebase --stat origin master
then then
printf '%s' "$GREEN" printf '%s' "$GREEN"
printf '%s\n' ' __ __ ' printf '%s\n' ' __ __ '