summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-30 11:55:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-30 11:55:38 -0700
commit6296062285e07051a5a46cbbd74c67a10bf2ac16 (patch)
tree1d4bb7d5ce2595bf288c3eac5f4e45e5673ea4e4 /Documentation
parentMerge branch 'as/maint-completion-set-u-fix' (diff)
parentbash completion: Support "divergence from upstream" messages in __git_ps1 (diff)
downloadtgif-6296062285e07051a5a46cbbd74c67a10bf2ac16.tar.xz
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 'Documentation')
-rw-r--r--Documentation/rev-list-options.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 73569c073e..cc562a057a 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -98,6 +98,15 @@ you would get an output like this:
This implies the '--topo-order' option by default, but the
'--date-order' option may also be specified.
+ifdef::git-rev-list[]
+--count::
+ 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.
+endif::git-rev-list[]
+
+
ifndef::git-rev-list[]
Diff Formatting
~~~~~~~~~~~~~~~