Re: [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 24, 2012, 18:49 UTC
Message-ID: <7v7grjz268.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1348508486-63176-1-git-send-email-jonathan@leto.net>

"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