Junio C Hamano 6296062285 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

2010-06-30 11:55:38 -07:00

..

git-completion.bash

Merge branch 'tr/rev-list-count'

2010-06-30 11:55:38 -07:00