Fix the detection of in-progress cherry-picks and reverts when the user commits or resets a conflict resolution in the middle of a sequence of picks/reverts. Phillip Wood (1): git-prompt: improve cherry-pick/revert detection contrib/completion/git-prompt.sh | 37 ++++++++++++++++++++++++++++---- t/t9903-bash-prompt.sh | 20 +++++++++++++++-- 2 files changed, 51 insertions(+), 6 deletions(-) base-commit: 8dca754b1e874719a732bc9ab7b0e14b21b1bc10 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-281%2Fphillipwood%2Fwip%2Fprompt-status-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-281/phillipwood/wip/prompt-status-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/281 -- gitgitgadget
