pull rebase to keep changes

This commit is contained in:
Hervé Cauwelier 2012-10-23 11:04:01 +02:00 committed by Hervé Cauwelier
commit 93d6e1f3eb

View file

@ -3,7 +3,7 @@ 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 pull --rebase origin master
then
printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '