threads / patch / 31638

patchImprove the description of GIT_PS1_SHOWUPSTREAM

Subject: [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM

## tl;dr

2 messages between Sep 24, 2012 and Sep 24, 2012. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Jonathan "Duke" Leto· Sep 24, 2012, 17:41 UTC · lore

From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>

Describe what '=' means in the output of __git_ps1 when using GIT_PS1_SHOWUPSTREAM, which was not previously described.

Signed-off-by: Jonathan "Duke" Leto <jonathan@leto.net>
---
 contrib/completion/git-prompt.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Show changes to contrib/completion/git-prompt.sh +4 −3

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 29b1ec9..bf20491 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -34,9 +34,10 @@
 #
 # If you would like to see the difference between HEAD and its upstream,
 # set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates you are behind, ">"
-# indicates you are ahead, and "<>" indicates you have diverged.  You
-# can further control behaviour by setting GIT_PS1_SHOWUPSTREAM to a
-# space-separated list of values:
+# indicates you are ahead, "<>" indicates you have diverged and "="
+# indicates that there is no difference. You can further control
+# behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated list
+# of values:
 #
 #     verbose       show number of commits ahead/behind (+/-) upstream
 #     legacy        don't use the '--count' option available in recent

-- 
1.7.12.1.397.gbdf37ee

Junio C Hamano· Sep 24, 2012, 18:49 UTC · re: Jonathan "Duke" Leto · lore

Re: [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM

"Jonathan \"Duke\" Leto" <jonathan@leto.net> writes:

Show 7 quoted lines

> From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
>
> Describe what '=' means in the output of __git_ps1 when using
> GIT_PS1_SHOWUPSTREAM, which was not previously described.
>
> Signed-off-by: Jonathan "Duke" Leto <jonathan@leto.net>
> ---

Makes sense; will directly apply to 'maint'.

Show 21 quoted lines

>  contrib/completion/git-prompt.sh | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> index 29b1ec9..bf20491 100644
> --- a/contrib/completion/git-prompt.sh
> +++ b/contrib/completion/git-prompt.sh
> @@ -34,9 +34,10 @@
>  #
>  # If you would like to see the difference between HEAD and its upstream,
>  # set GIT_PS1_SHOWUPSTREAM="auto".  A "<" indicates you are behind, ">"
> -# indicates you are ahead, and "<>" indicates you have diverged.  You
> -# can further control behaviour by setting GIT_PS1_SHOWUPSTREAM to a
> -# space-separated list of values:
> +# indicates you are ahead, "<>" indicates you have diverged and "="
> +# indicates that there is no difference. You can further control
> +# behaviour by setting GIT_PS1_SHOWUPSTREAM to a space-separated list
> +# of values:
>  #
>  #     verbose       show number of commits ahead/behind (+/-) upstream
>  #     legacy        don't use the '--count' option available in recent