diff options
| author | Robby Russell <robby@planetargon.com> | 2013-06-25 09:06:54 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-06-25 09:06:54 -0700 |
| commit | 2b88b0d9926be3d178c9d70578c7d019d26fd3b9 (patch) | |
| tree | 2cd3dcf9a245d1a3cf11a89164e5f60d5271df78 /tools/upgrade.sh | |
| parent | 84b9598e4e3d3509d11618b84de4db5057629cd2 (diff) | |
| parent | 87a1d8a02df5413b4e718eb0fb486535f0aae8e3 (diff) | |
| download | zsh-2b88b0d9926be3d178c9d70578c7d019d26fd3b9.tar.gz zsh-2b88b0d9926be3d178c9d70578c7d019d26fd3b9.tar.bz2 zsh-2b88b0d9926be3d178c9d70578c7d019d26fd3b9.zip | |
Merge pull request #1908 from UncleBill/patch-1
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' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' |