dominic/prezto
1
0
Fork 0
Code Releases Activity

rebase when merging

Browse source
This commit is contained in:
Jonathan Dahan 2012-01-29 22:22:45 -05:00
parent 4fe4155ecc
commit 2c73f54b2a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
functions/update-omz
View file

@ -21,7 +21,7 @@ cd $OMZ_HOME
zstyle -t ':omz:function:update-omz' auto-commit || local nocommit='--no-commit'
zstyle -t ':omz:function:update-omz' upstream '_upstream'
if git pull $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then
if git pull --rebase $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then
zstyle -t ':omz:function:update-omz' color && printf "$FG[blue]"
printf 'Hooray! oh-my-zsh is up-to-date :)\n'
else