From 52cd568d3bea82b05473787c65056c5462da1381 Mon Sep 17 00:00:00 2001 From: Jonathan Dahan Date: Fri, 27 Jan 2012 04:37:04 -0500 Subject: [PATCH] add option to change upstream --- functions/update-omz | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions/update-omz b/functions/update-omz index 47359a1d..092f06e9 100755 --- a/functions/update-omz +++ b/functions/update-omz @@ -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