]> git.99rst.org Git - git.git/commitdiff
Merge branch 'jd/prompt-upstream-mark'
authorJunio C Hamano <redacted>
Thu, 31 Mar 2022 01:01:11 +0000 (18:01 -0700)
committerJunio C Hamano <redacted>
Thu, 31 Mar 2022 01:01:11 +0000 (18:01 -0700)
Tweaks in the command line prompt (in contrib/) code around its
GIT_PS1_SHOWUPSTREAM feature.

* jd/prompt-upstream-mark:
  git-prompt: put upstream comments together
  git-prompt: make long upstream state indicator consistent
  git-prompt: make upstream state indicator location consistent
  git-prompt: rename `upstream` to `upstream_type`


Trivial merge
git clone https://git.99rst.org/PROJECT