git-pull add --rebase option

This commit is contained in:
UncleBill 2013-06-25 12:08:02 +08:00
parent 78dba754d1
commit 87a1d8a02d

View file

@ -1,6 +1,6 @@
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh" printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd "$ZSH" cd "$ZSH"
if git pull origin master if git pull --rebase origin master
then then
printf '\033[0;32m%s\033[0m\n' ' __ __ ' printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '