git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM
@ 2012-09-24 17:41 Jonathan "Duke" Leto
  2012-09-24 18:49 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Jonathan "Duke" Leto @ 2012-09-24 17:41 UTC (permalink / raw)
  To: git; +Cc: Jonathan "Duke" Leto

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(-)

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM
  2012-09-24 17:41 [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM Jonathan "Duke" Leto
@ 2012-09-24 18:49 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2012-09-24 18:49 UTC (permalink / raw)
  To: Jonathan "Duke" Leto; +Cc: git

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

> 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'.

>  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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-09-24 18:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-24 17:41 [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM Jonathan "Duke" Leto
2012-09-24 18:49 ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).