diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2018-02-08 11:10:56 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2018-02-08 11:10:56 -0700 |
| commit | b7b623d6de696b81d213ec666d072851561d5c06 (patch) | |
| tree | 996eeb851a9be04c351c4067ed6608c17c8164e8 /lib | |
| parent | b388fd7fdaccf2875cb5ef58c100dd7634b74bc3 (diff) | |
| parent | 37c2d0ddd751e15d0c87a51e2d9f9849093571dc (diff) | |
| download | zsh-b7b623d6de696b81d213ec666d072851561d5c06.tar.gz zsh-b7b623d6de696b81d213ec666d072851561d5c06.tar.bz2 zsh-b7b623d6de696b81d213ec666d072851561d5c06.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/git.zsh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/git.zsh b/lib/git.zsh index 167b4b0ea..9b0f6e36f 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -141,11 +141,15 @@ function git_prompt_status() { STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" + elif $(echo "$INDEX" | grep '^MM ' &> /dev/null); then + STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$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 '^MM ' &> /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 |