Merge branch 'master' of github.com:git/git
commitce51ed5195226c35f8af8f177345051e84b092c7
authorJiang Xin <worldhello.net@gmail.com>
Wed, 22 Jun 2022 07:46:22 +0000 (22 15:46 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Wed, 22 Jun 2022 07:46:22 +0000 (22 15:46 +0800)
treef8c3bd9bf14ffa1e89c463637a6389b7e65f5180
parent74e34a0ee2920c7f8f57e36c7346495b6dd6b9f2
parentddbc07872e86265dc30aefa5f4d881f762120044
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