From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jul 2015 21:26:12 +0000 (-0700)
Subject: Merge branch 'ls/hint-rev-list-count'
X-Git-Tag: v2.5.0-rc2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b3a30f6e0cb30ebe37381818aec594e99fd380ff?ds=inline;hp=-c

Merge branch 'ls/hint-rev-list-count'

* ls/hint-rev-list-count:
rev-list: add --count to usage guide
---

b3a30f6e0cb30ebe37381818aec594e99fd380ff
diff --combined builtin/rev-list.c
index 88eddbd53a,ee9e8725bb..c0b4b53652
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@@ -42,6 -42,7 +42,7 @@@ static const char rev_list_usage[] 
  "    --abbrev=<n> | --no-abbrev\n"
  "    --abbrev-commit\n"
  "    --left-right\n"
+ "    --count\n"
  "  special purpose:\n"
  "    --bisect\n"
  "    --bisect-vars\n"
@@@ -355,7 -356,7 +356,7 @@@ int cmd_rev_list(int argc, const char *
  	if (bisect_list)
  		revs.limited = 1;
  
 -	if (use_bitmap_index) {
 +	if (use_bitmap_index && !revs.prune) {
  		if (revs.count && !revs.left_right && !revs.cherry_mark) {
  			uint32_t commit_count;
  			if (!prepare_bitmap_walk(&revs)) {