From 34792a68e4e8d430e1fbf5ee6458c212c5b6ef5c Mon Sep 17 00:00:00 2001 From: Bob Maerten Date: Wed, 17 Apr 2013 17:43:40 +0200 Subject: [PATCH] Rebase instead of pull when upgrading In order to keep local changes and/or prevent conflicts --- tools/upgrade.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 0aeebdebf..896900ef8 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -3,8 +3,9 @@ current_path=${current_path/ /\\ } printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh" cd "$ZSH" -if git pull origin master +if git fetch origin then + git rebase origin/master printf '\033[0;32m%s\033[0m\n' ' __ __ ' printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '