From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jun 2010 18:55:38 +0000 (-0700)
Subject: Merge branch 'tr/rev-list-count'
X-Git-Tag: v1.7.2-rc1~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6296062285e07051a5a46cbbd74c67a10bf2ac16;p=git.git

Merge branch 'tr/rev-list-count'

* tr/rev-list-count:
  bash completion: Support "divergence from upstream" messages in __git_ps1
  rev-list: introduce --count option

Conflicts:
	contrib/completion/git-completion.bash
---

6296062285e07051a5a46cbbd74c67a10bf2ac16
diff --cc contrib/completion/git-completion.bash
index bc9df12bf,550985daf..67569901e
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -127,11 -264,12 +264,12 @@@ __git_ps1 (
  			}
  		fi
  
 -		local w
 -		local i
 -		local s
 -		local u
 -		local c
 +		local w=""
 +		local i=""
 +		local s=""
 +		local u=""
 +		local c=""
+ 		local p=""
  
  		if [ "true" = "$(git rev-parse --is-inside-git-dir 2>/dev/null)" ]; then
  			if [ "true" = "$(git rev-parse --is-bare-repository 2>/dev/null)" ]; then