summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-30 18:55:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-30 18:55:38 (GMT)
commit6296062285e07051a5a46cbbd74c67a10bf2ac16 (patch)
tree1d4bb7d5ce2595bf288c3eac5f4e45e5673ea4e4 /revision.c
parent304d8b6256db7aca7772c0a994a7c1c987eabd97 (diff)
parent6d158cba282f22fa1548af1188f78042fed30aed (diff)
downloadgit-6296062285e07051a5a46cbbd74c67a10bf2ac16.zip
git-6296062285e07051a5a46cbbd74c67a10bf2ac16.tar.gz
git-6296062285e07051a5a46cbbd74c67a10bf2ac16.tar.bz2
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
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 5403581..527ec34 100644
--- a/revision.c
+++ b/revision.c
@@ -1253,6 +1253,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->boundary = 1;
} else if (!strcmp(arg, "--left-right")) {
revs->left_right = 1;
+ } else if (!strcmp(arg, "--count")) {
+ revs->count = 1;
} else if (!strcmp(arg, "--cherry-pick")) {
revs->cherry_pick = 1;
revs->limited = 1;