From af912fc5d6448fc3d69932d725ffe3e7725a8949 Mon Sep 17 00:00:00 2001 From: Bryan Tidwell Date: Sun, 13 Nov 2016 20:21:40 -0600 Subject: [PATCH] set upgrade to look at upstream if it exists --- tools/upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/upgrade.sh b/tools/upgrade.sh index d5e7e8ba..85c4bbb8 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -22,7 +22,7 @@ fi printf "${BLUE}%s${NORMAL}\n" "Updating Oh My 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 printf '%s' "$GREEN" printf '%s\n' ' __ __ '