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.lorimer.id.au/gitweb.git/diff_plain/6296062285e07051a5a46cbbd74c67a10bf2ac16?hp=6296062285e07051a5a46cbbd74c67a10bf2ac16

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