Merge pull request #1908 from UncleBill/patch-1

git-pull add --rebase option
2013-06-25 09:06:54 -07:00 · 2013-06-25 09:06:54 -07:00 · 2b88b0d992
commit 2b88b0d992
parent 84b9598e4e 87a1d8a02d
1 changed files with 1 additions and 1 deletions
--- 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' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '