Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Donald Stufft 2011-12-20 22:06:05 -05:00
commit 9eb1bf5c76
60 changed files with 1561 additions and 141 deletions

View file

@ -52,7 +52,9 @@ git_prompt_status() {
if $(echo "$INDEX" | grep '^RM ' &> /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