diff options
| author | UncleBill <billbill290@gmail.com> | 2013-06-25 12:08:02 +0800 |
|---|---|---|
| committer | UncleBill <billbill290@gmail.com> | 2013-06-25 12:08:02 +0800 |
| commit | 87a1d8a02df5413b4e718eb0fb486535f0aae8e3 (patch) | |
| tree | d03774bc6f0c8345d76bfbc7c91b3280f8ef42a4 /tools/upgrade.sh | |
| parent | 78dba754d183804079474aa2b1390bd96cb67583 (diff) | |
| download | zsh-87a1d8a02df5413b4e718eb0fb486535f0aae8e3.tar.gz zsh-87a1d8a02df5413b4e718eb0fb486535f0aae8e3.tar.bz2 zsh-87a1d8a02df5413b4e718eb0fb486535f0aae8e3.zip | |
git-pull add --rebase option
Diffstat (limited to 'tools/upgrade.sh')
| -rw-r--r-- | tools/upgrade.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 3624a88e5..e04fc672f 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 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' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' |