]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'pw/prompt-cherry-pick-revert-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:22 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:22 +0000 (11:30 -0700)
commit8a4acc5f4cdd811476ffa0b5c63ae4cc35ef288f
tree2b74cebb26cc6fdeff4c5a7a029fe9b6dcda7f9c
parentd60dc1a0b3829f3c4d69696f43f1c178c0701cdb
parente981bf75251ecab712fa70ea2fe995a973ed5dba
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