`2b88b0d9926be3d178c9d70578c7d019d26fd3b9`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2013-06-25 16:06 UTC

Message

Merge pull request #1908 from UncleBill/patch-1

git-pull add --rebase option

Diff

 1diff --git a/tools/upgrade.sh b/tools/upgrade.sh
 2index 3624a88e5a5f3101a343cda98810fd01fa9e44af..e04fc672f8b5f62775e00d8e0aad2958b5ed32e5 100644
 3--- a/tools/upgrade.sh
 4+++ b/tools/upgrade.sh
 5@@ -1,6 +1,6 @@
 6 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 7 cd "$ZSH"
 8-if git pull origin master
 9+if git pull --rebase origin master
10 then
11   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
12   printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '