From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2019 18:30:22 +0000 (-0700)
Subject: Merge branch 'pw/prompt-cherry-pick-revert-fix'
X-Git-Tag: v2.23.0-rc0~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a4acc5f4cdd811476ffa0b5c63ae4cc35ef288f;p=git

Merge branch 'pw/prompt-cherry-pick-revert-fix'

When one step in multi step cherry-pick or revert is reset or
committed, the command line prompt script failed to notice the
current status, which has been improved.

* pw/prompt-cherry-pick-revert-fix:
  git-prompt: improve cherry-pick/revert detection
---

8a4acc5f4cdd811476ffa0b5c63ae4cc35ef288f