summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-24 12:50:36 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-24 12:50:36 -0700
commitb5d156c3622fa522966034c78fd6ed9a15504d46 (patch)
treefca4cc5d315dd77becd730321f1b7df72a420596 /contrib
parent16eed7c9938a65022010c3d95ada911b2fd46d25 (diff)
parent1a002c73ba63799dda75a4c28da5b562eea7a3ff (diff)
downloadgit-b5d156c3622fa522966034c78fd6ed9a15504d46.tar.gz
Sync with maint
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-prompt.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 29b1ec9eb1..bf20491ec3 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