Improve git prompt during rebase conflicts

[bphenriques]

Hello, thank you for the project!

Short: when a rebase has conflicts, the base branch is shown rather than the current one.

Reproduce steps:

1. Have two branches A
2. Create a branch B out of A and change a file. Commit.
3. Go to branch A and modify the same file. Commit.
4. Go to branch B and git rebase A. It should prompt you that you have conflicts and you may need to resolve them.

Expectations: the current branch should still be B but in the middle of a rebase. Ideally it should show that we are in the middle of a rebase. The last line in the screenshot below:

My setup

Variables:

        set -U pure_enable_single_line_prompt true
        set -U pure_enable_virtualenv false
        set -U pure_color_success green
        set -U pure_shorten_window_title_current_directory_length 1
        set -g async_prompt_functions _pure_prompt_git

Regarding plugins besides pure, I have autopair, fish-async-prompt and some custom ones that have no relation with git. I can share my dotfiles (nix though) if helpful.

If there is interest, I can look into it and perhaps follow a similar format to powerlevel10k (I came from zsh). Suggestions?

Env

Pure

4.8.0

Fish

fish, version 3.7.0

OS/distribution

MacOS

[bphenriques]

Example from powerlevel10k:

Perhaps too verbose. At least it is clear we are in the middle of a rebase