From: Jiang Xin <worldhello.net@gmail.com>
Date: Wed, 22 Jun 2022 07:46:22 +0000 (+0800)
Subject: Merge branch 'master' of github.com:git/git
X-Git-Tag: v2.37.0~2^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce51ed5195226c35f8af8f177345051e84b092c7;p=thirdparty%2Fgit.git

Merge branch 'master' of github.com:git/git

* 'master' of github.com:git/git:
  name-rev: prefix annotate-stdin with '--' in message
  git-prompt: fix expansion of branch colour codes
  git-prompt: make colourization consistent
---

ce51ed5195226c35f8af8f177345051e84b092c7