dominic/prezto
1
0
Fork 0
Code Releases Activity

add option to change upstream

Browse source
This commit is contained in:
Jonathan Dahan 2012-01-27 04:37:04 -05:00
parent 28b98ee8ab
commit 52cd568d3b
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
functions/update-omz
View file

@ -11,8 +11,9 @@ current_path=$PWD
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 origin master; then
if git pull $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 :)'
else