diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-03-30 18:01:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-03-30 18:01:11 -0700 |
commit | 2ea7e40c53512c410cfc769f6817d31c3bec9941 (patch) | |
tree | 3a540fdcd0609c2cd983b1275d8a91921996a9be /t/t6010-merge-base.sh | |
parent | Merge branch 'pw/add-p-single-key' (diff) | |
parent | git-prompt: put upstream comments together (diff) | |
download | tgif-2ea7e40c53512c410cfc769f6817d31c3bec9941.tar.xz |
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`
Diffstat (limited to 't/t6010-merge-base.sh')
0 files changed, 0 insertions, 0 deletions