|
|
@ -1,11 +1,19 @@
|
|
|
|
# Update OMZ
|
|
|
|
# Update OMZ
|
|
|
|
# Jonathan Dahan <jonathan@jedahan.com>
|
|
|
|
# Jonathan Dahan <jonathan@jedahan.com>
|
|
|
|
|
|
|
|
|
|
|
|
# To auto-commit changes from upstream without review (dangerous!), add to your zshrc:
|
|
|
|
# There are two options that can be added to your zshrc
|
|
|
|
|
|
|
|
#
|
|
|
|
|
|
|
|
# If upstream is a branch other than origin, add
|
|
|
|
|
|
|
|
#
|
|
|
|
|
|
|
|
# zstyle ':omz:function:update-omz' upstream 'my-upstream-branch'
|
|
|
|
|
|
|
|
#
|
|
|
|
|
|
|
|
# To automatically commit from upstream, add
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# zstyle ':omz:function:update-omz' auto-commit 'yes'
|
|
|
|
# zstyle ':omz:function:update-omz' auto-commit 'yes'
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# This will still favor local changes when there are conflicts
|
|
|
|
# If you really need auto-updating and do not care about losing data, try
|
|
|
|
|
|
|
|
#
|
|
|
|
|
|
|
|
# ( [ ! -f ~/.omz-update ] || [ ~/.omz-update(Nmh+6) ] ) && update-omz && touch ~/.omz-update
|
|
|
|
|
|
|
|
|
|
|
|
current_path=$PWD
|
|
|
|
current_path=$PWD
|
|
|
|
cd $OMZ_HOME
|
|
|
|
cd $OMZ_HOME
|
|
|
|