Merge branch 'bash-prompt-color-refactorization' into bash-prompt-speedup-and-color-refactorization

* bash-prompt-color-refactorization:
  fixup! git-prompt.sh: add missing information in comments
  git-prompt.sh: add missing information in comments
  git-prompt.sh: do not print duplicate clean color code
  git-prompt.sh: refactor colored prompt code
  t9903: add tests for git-prompt pcmode

Conflicts:
	contrib/completion/git-prompt.sh