rebasing easily makes confilict and harm co-developing flow

This commit is contained in:
UncleBill 2013-09-01 07:22:21 +08:00
commit 57532cc5f8

View file

@ -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' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '