Justin Donnelly 0ec7c23cdc git-prompt: make upstream state indicator location consistent ... Make upstream state indicator location more consistent with similar state indicators (e.g. sparse). Group the short upstream state indicator (`=`, `<`, `>`, or `<>`) with other short state indicators immediately after the branch name. Previously short and long upstream state indicators appeared after all other state indicators. Use a separator (`SP` or `GIT_PS1_STATESEPARATOR`) between branch name and short upstream state indicator. Previously the short upstream state indicator would sometimes appear directly adjacent to the branch name instead of being separated. For comparison, `__git_ps1` examples without upstream state indicator: (main) (main %) (main *%) (main|SPARSE) (main %|SPARSE) (main *%|SPARSE) (main|SPARSE|REBASE 1/2) (main %|SPARSE|REBASE 1/2) Note that if there are short state indicators, they appear together after the branch name and separated from it by `SP` or `GIT_PS1_STATESEPARATOR`. Before/after examples with short upstream state indicator: | Before | After | | ---------------- | ---------------- | | (main=) | (main =) | | (main|SPARSE=) | (main =|SPARSE) | | (main %|SPARSE=) | (main %=|SPARSE) | Signed-off-by: Justin Donnelly <justinrdonnelly@gmail.com> Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2022-03-23 13:07:40 -07:00
..
.gitattributes	completion: mark bash script as LF-only	2017-05-10 13:32:51 +09:00
git-completion.bash	Merge branch 'ab/complete-show-all-commands'	2022-02-17 16:25:06 -08:00
git-completion.tcsh	completion: tcsh: Fix regression by drop of wrapper functions	2021-08-18 13:58:27 -07:00
git-completion.zsh	contrib/completion: fix zsh completion regression from 59d85a2a05	2021-06-02 12:49:40 +09:00
git-prompt.sh	git-prompt: make upstream state indicator location consistent	2022-03-23 13:07:40 -07:00