Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

Conflicts:
	.gitignore
	lib/directories.zsh
	lib/termsupport.zsh
	lib/theme-and-appearance.zsh
	oh-my-zsh.sh
	plugins/git/git.plugin.zsh
	plugins/osx/osx.plugin.zsh
This commit is contained in:
Sven Lito 2011-04-16 13:20:58 +01:00
commit e0ca1b0f68
52 changed files with 976 additions and 101 deletions

View file

@ -26,6 +26,10 @@ git_prompt_status() {
fi
if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS"
fi
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"