Fish git prompt doesn't show (U)pdated but (U)nmerged changes
zx8 opened this issue · comments
I changed a file (foo
) and there was a conflict when I rebased, ending up in:
$ git status --porcelain
UU foo
Which configuration? The git prompt has about twelve options too many, and here it's important which path you're taking.
E.g. the "informative" version (which I recommend against because it's annoyingly slow) specifically checks for UU
.
__fish_git_prompt_showcolorhints 1
__fish_git_prompt_showdirtystate 1
__fish_git_prompt_showstashstate 1
__fish_git_prompt_showuntrackedfiles 1
__fish_git_prompt_showupstream verbose auto