Merge branch 'jp/prompt-clear-before-upstream-mark'
commitddbc07872e86265dc30aefa5f4d881f762120044
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2022 17:07:50 +0000 (21 10:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Jun 2022 17:07:50 +0000 (21 10:07 -0700)
tree5267bc19fa672c5a8b0e3eab86c6aecf388b637f
parent325240dfd76bc6a47e5a89beccf27b236b70e2ac
parent0e5d9ef395467619b621540a7fdefbfc8062f2ac
Merge branch 'jp/prompt-clear-before-upstream-mark'

Bash command line prompt (in contrib/) update.

* jp/prompt-clear-before-upstream-mark:
  git-prompt: fix expansion of branch colour codes
  git-prompt: make colourization consistent