]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jd/prompt-upstream-mark'
authorJunio C Hamano <gitster@pobox.com>
Thu, 31 Mar 2022 01:01:11 +0000 (18:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 31 Mar 2022 01:01:11 +0000 (18:01 -0700)
commit2ea7e40c53512c410cfc769f6817d31c3bec9941
tree3a540fdcd0609c2cd983b1275d8a91921996a9be
parentd7234921273fd55ce33d44ae2735645650800870
parent094b5409eadd064110f3e74d880fad91e9ca0f0b
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`