Merge with upstream.

This commit is contained in:
Steve Losh 2011-08-12 12:25:19 -04:00
commit 9ab8458a11
46 changed files with 2319 additions and 126 deletions

View file

@ -68,7 +68,9 @@ git_prompt_status() {
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS"
fi
if $(echo "$INDEX" | grep '^D ' &> /dev/null); then
if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
fi
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then