summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKimberly Zick <k@9k1.us>2018-01-22 22:14:05 -0500
committerRobby Russell <robby@planetargon.com>2018-01-22 19:14:05 -0800
commit2b6c502aa5ab56a9db21e90324789a56d83a0cfc (patch)
treede094db30cf86554cfeec1fe39eca3759354c3de
parentc3b072eace1ce19a48e36c2ead5932ae2d2e06d9 (diff)
downloadzsh-2b6c502aa5ab56a9db21e90324789a56d83a0cfc.tar.gz
zsh-2b6c502aa5ab56a9db21e90324789a56d83a0cfc.tar.bz2
zsh-2b6c502aa5ab56a9db21e90324789a56d83a0cfc.zip
Add match for `MM` (result of `git commit -p` on a single changed file) to git_prompt_status (#3632)
-rw-r--r--lib/git.zsh4
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