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

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc contrib/completion/git-completion.bash
index bc9df12bf10bdcc3942eff4dc674d6d7440b3447,550985daf563ed47fe7eed7faaaf2d9d09c42727..67569901e71e5062199e48304afc424f15b57ba1
--- 1/contrib/completion/git-completion.bash
--- 2/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

diff --cc revision.c
Simple merge

diff --cc revision.h
Simple merge