Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ls/hint-rev-list-count' into maint
author
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Jul 2015 19:21:47 +0000
(12:21 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Jul 2015 19:21:47 +0000
(12:21 -0700)
* ls/hint-rev-list-count:
rev-list: add --count to usage guide
1
2
builtin/rev-list.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
315b3ba
75d2e5a
)
diff --combined
builtin/rev-list.c
index 88eddbd53aa598d36d0f106008094443c0913872,ee9e8725bb241ab6f684dc09c01d59388a74930f..c0b4b53652a39049ec06ba69f2dfc50a8c0873f7
---
1
/
builtin/rev-list.c
---
2
/
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)) {