Code

Merge branch 'tr/rev-list-count'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:38 +0000 (11:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Jun 2010 18:55:38 +0000 (11:55 -0700)
commit6296062285e07051a5a46cbbd74c67a10bf2ac16
tree1d4bb7d5ce2595bf288c3eac5f4e45e5673ea4e4
parent304d8b6256db7aca7772c0a994a7c1c987eabd97
parent6d158cba282f22fa1548af1188f78042fed30aed
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
Documentation/rev-list-options.txt
contrib/completion/git-completion.bash
revision.c
revision.h