aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-04 15:51:53 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-04 15:51:53 -0700
commit117374fe3c58cd98ffb56997e70d2de4ce7acdac (patch)
tree4eab50f914ddd6200a66cd95f382c931a1ec60e8 /Documentation
parenta211e6712bac61a00f8182a8eedb6683dbe4d31f (diff)
parentb388e14b89f0a82b8067b3922a93cf2d1b013ff0 (diff)
downloadgit-117374fe3c58cd98ffb56997e70d2de4ce7acdac.tar.gz
git-117374fe3c58cd98ffb56997e70d2de4ce7acdac.tar.xz
Merge branch 'mg/rev-list-count-cherry'
* mg/rev-list-count-cherry: rev-list --count: separate count for --cherry-mark
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/rev-list-options.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 73111bb05..52bae31fc 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -730,7 +730,10 @@ ifdef::git-rev-list[]
Print a number stating how many commits would have been
listed, and suppress all other output. When used together
with '--left-right', instead print the counts for left and
- right commits, separated by a tab.
+ right commits, separated by a tab. When used together with
+ '--cherry-mark', omit patch equivalent commits from these
+ counts and print the count for equivalent commits separated
+ by a tab.
endif::git-rev-list[]