From 57532cc5f8ba00d638505264499989ef5b1645cd Mon Sep 17 00:00:00 2001
From: UncleBill <billbill290@gmail.com>
Date: Sun, 1 Sep 2013 07:22:21 +0800
Subject: [PATCH] rebasing easily makes confilict and harm co-developing flow

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index e04fc672f..3624a88e5 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 --rebase origin master
+if git pull origin master
 then
   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
   printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '