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

Merge remote-tracking branch 'robbyrussel/master' into mergetest

Browse source 
Conflicts:
	lib/git.zsh
	oh-my-zsh.sh
This commit is contained in:
Locojay 2011-06-05 20:31:29 -04:00
commit b72cbe35b5
16 changed files with 170 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

10
oh-my-zsh.sh
View file

@ -1,3 +1,9 @@
# Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" != "true" ]
then
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi
# Initializes Oh My Zsh
# Disable colors on dumb terminals
@ -30,7 +36,6 @@ for plugin ($plugins); do
done
# Load the theme
# Check for updates on initial load...
if [ "$ZSH_THEME" = "random" ]
then
themes=($ZSH/themes/*zsh-theme)
@ -43,6 +48,7 @@ else
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
fi
<<<<<<< HEAD
# Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file
@ -58,3 +64,5 @@ then
else
/usr/bin/env zsh $ZSH/tools/check_for_upgrade.sh
fi
=======
>>>>>>> robbyrussel/master