From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 31 Mar 2022 01:01:11 +0000 (-0700)
Subject: Merge branch 'jd/prompt-upstream-mark'
X-Git-Tag: v2.36.0-rc0~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ea7e40c53512c410cfc769f6817d31c3bec9941;p=thirdparty%2Fgit.git

Merge branch 'jd/prompt-upstream-mark'

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`
---

2ea7e40c53512c410cfc769f6817d31c3bec9941