From 1cda742727bd610aa5cc1785b6c5add136b16542 Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Mon, 7 Apr 2014 20:17:59 -0700 Subject: [PATCH] Break out pull --rebase into fetch; rebase --autostash ...this should make auto-updating a little less of a perpetual fail for those of us with a tendency to tinker. Not that anyone who uses zsh and oh-my-zsh would have such a tendency :) --- tools/upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 9a8497d9..669e9d70 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,6 +1,6 @@ printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh" cd "$ZSH" -if git pull --rebase --stat origin master +if git fetch origin && git rebase --autostash --stat origin/master then printf '\033[0;32m%s\033[0m\n' ' __ __ ' printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '