git-pull add --rebase option

87a1d8a0 · UncleBill · 78dba754 · 87a1d8a0
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

tools/upgrade.sh tools/upgrade.sh +1 -1

未找到文件。
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
 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' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '