|
@@ -38,7 +38,7 @@ function git_prompt_long_sha() {
|
|
|
|
|
|
# Get the status of the working tree
|
|
|
git_prompt_status() {
|
|
|
- INDEX=$(git status --porcelain 2> /dev/null)
|
|
|
+ INDEX=$(git status --porcelain -b 2> /dev/null)
|
|
|
STATUS=""
|
|
|
if $(echo "$INDEX" | grep '^?? ' &> /dev/null); then
|
|
|
STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS"
|
|
@@ -66,6 +66,15 @@ git_prompt_status() {
|
|
|
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
|
|
|
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
|
|
|
fi
|
|
|
+ if $(echo "$INDEX" | grep '^## .*ahead' &> /dev/null); then
|
|
|
+ STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS"
|
|
|
+ fi
|
|
|
+ if $(echo "$INDEX" | grep '^## .*behind' &> /dev/null); then
|
|
|
+ STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS"
|
|
|
+ fi
|
|
|
+ if $(echo "$INDEX" | grep '^## .*diverged' &> /dev/null); then
|
|
|
+ STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS"
|
|
|
+ fi
|
|
|
echo $STATUS
|
|
|
}
|
|
|
|