summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2011-02-21 21:50:36 -0800
committerRobby Russell <robby@planetargon.com>2011-02-21 21:50:36 -0800
commit6a3f406468e95e5b9731db1415aeb83922a26359 (patch)
tree33f5c7a0119fc5476569d1e35cdfd1d6c99c66fa
parent6235467421f49e1e8f68a7b2c7e26014c62d4f82 (diff)
parent90a9a5f251b2273735b58be55014d94582f1db91 (diff)
downloadzsh-6a3f406468e95e5b9731db1415aeb83922a26359.tar.gz
zsh-6a3f406468e95e5b9731db1415aeb83922a26359.tar.bz2
zsh-6a3f406468e95e5b9731db1415aeb83922a26359.zip
Merge branch 'lib-git' of https://github.com/sorin-ionescu/oh-my-zsh into sorin-ionescu-lib-git
-rw-r--r--lib/git.zsh4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/git.zsh b/lib/git.zsh
index 75fdc1f9c..8512de8a4 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -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"