linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

finally merged with upstream

Browse source
This commit is contained in:
Mike Hostetler 2011-03-16 14:56:04 -05:00
commit 23496fa683
90 changed files with 2442 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

14
oh-my-zsh.sh
View file

@ -10,3 +10,17 @@ for config_file ($ZSH/lib/*.zsh) source $config_file
# Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file
<<<<<<< HEAD
=======
# Load all of the plugins that were defined in ~/.zshrc
plugin=${plugin:=()}
for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
# Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" = "true" ]
then
return
else
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi
>>>>>>> upstream/master