mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2025-12-26 02:12:33 +01:00
fix git-prompt bug where the INDEX would appear dirty if you had an unmerged change.
ashleydev.zsh-theme: add bold yellow to branch color if unmerged state preset; overrides the red dirty color.
This commit is contained in:
parent
24dafb39da
commit
8a013666f0
2 changed files with 4 additions and 1 deletions
|
|
@ -192,7 +192,6 @@ git_prompt__dirty_state ()
|
|||
|
||||
if [[ "$line" = UU* ]]; then
|
||||
GIT_PROMPT_DIRTY_STATE_INDEX_UNMERGED='yes'
|
||||
GIT_PROMPT_DIRTY_STATE_INDEX_DIRTY='yes'
|
||||
GIT_PROMPT_DIRTY_STATE_ANY_DIRTY='yes'
|
||||
fi
|
||||
done < <(git status --porcelain 2> /dev/null)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue