]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'master' of github.com:git/git
authorJiang Xin <worldhello.net@gmail.com>
Wed, 22 Jun 2022 07:46:22 +0000 (15:46 +0800)
committerJiang Xin <worldhello.net@gmail.com>
Wed, 22 Jun 2022 07:46:22 +0000 (15:46 +0800)
* '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


Trivial merge