diff options
| author | yleo77 <ylep77@gmail.com> | 2013-07-16 16:37:18 +0800 |
|---|---|---|
| committer | yleo77 <ylep77@gmail.com> | 2013-07-16 16:37:18 +0800 |
| commit | 67b2781f6200a0dff35055eb67937a0df2be2c51 (patch) | |
| tree | 73b692f4146042966f7d2fed10ab88946cbc077b /tools/upgrade.sh | |
| parent | 6b832b93588567cb00b9a9e8170a5ebf539dea51 (diff) | |
| parent | 7f74294d7aa7ab86e18e70a1153c15fa373c5849 (diff) | |
| download | zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.tar.gz zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.tar.bz2 zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.zip | |
Merge remote-tracking branch 'robbyrussell/master'
Diffstat (limited to 'tools/upgrade.sh')
| -rw-r--r-- | tools/upgrade.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 0aeebdebf..e04fc672f 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,9 +1,6 @@ -current_path=`pwd` -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' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' @@ -17,4 +14,3 @@ else printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?' fi -cd "$current_path" |