git-prompt: put upstream comments together
Commit 6d158cba28 (bash completion: Support "divergence from upstream" messages in __git_ps1, 2010-06-17) introduced support for indicating divergence from upstream in the PS1 prompt. The comments at the top of git-prompt.sh that were introduced with that commit are several paragraphs long. Over the years, other comments have been inserted in between the paragraphs relating to divergence from upstream. This commit puts the comments relating to divergence from upstream back together. 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>
Justin Donnelly committed
Feb 27, 2022 at 19:57 UTC
094b5409eadd064110f3e74d880fad91e9ca0f0b
1 file changed
+5
-5
contrib/completion/git-prompt.sh
+5
-5
@@ -66,6 +66,11 @@
66
# git always compare HEAD to @{upstream}
67
# svn always compare HEAD to your SVN upstream
68
#
69
+# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
70
+# find one, or @{upstream} otherwise. Once you have set
71
+# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
72
+# setting the bash.showUpstream config variable.
73
+#
74
# You can change the separator between the branch name and the above
75
# state symbols by setting GIT_PS1_STATESEPARATOR. The default separator
76
# is SP.
@@ -79,11 +84,6 @@
84
# single '?' character by setting GIT_PS1_COMPRESSSPARSESTATE, or omitted
85
# by setting GIT_PS1_OMITSPARSESTATE.
86
#
82
-# By default, __git_ps1 will compare HEAD to your SVN upstream if it can
83
-# find one, or @{upstream} otherwise. Once you have set
84
-# GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
85
-# setting the bash.showUpstream config variable.
86
-#
87
# If you would like to see more information about the identity of
88
# commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
89
# to one of these values: