1
0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-01-25 03:36:32 +01:00

Merge pull request #1477 from madsgraphics/git_prompt_showstashstate

Add Stash toogle to display if there's some stash or not in `git_prompt_status`
This commit is contained in:
Robby Russell
2012-12-09 09:03:02 -08:00

View File

@@ -85,6 +85,9 @@ git_prompt_status() {
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
fi fi
if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then
STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
fi
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
fi fi