summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 12:41:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 12:41:14 -0700
commit1f2705e20fa5f2d3c93663296eef723f45d1fa41 (patch)
treeb8dcaa8a4a860c640058401b51ced3abbcba2630 /Documentation
parentMerge branch 'jl/submodule-update-quiet' into maint (diff)
parenttag: accept multiple patterns for --list (diff)
downloadtgif-1f2705e20fa5f2d3c93663296eef723f45d1fa41.tar.xz
Merge branch 'jk/tag-list-multiple-patterns' into maint
* jk/tag-list-multiple-patterns: tag: accept multiple patterns for --list
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-tag.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index d82f62120a..fb1c0ac694 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
<tagname> [<commit> | <object>]
'git tag' -d <tagname>...
-'git tag' [-n[<num>]] -l [--contains <commit>] [<pattern>]
+'git tag' [-n[<num>]] -l [--contains <commit>] [<pattern>...]
'git tag' -v <tagname>...
DESCRIPTION
@@ -69,8 +69,11 @@ OPTIONS
If the tag is not annotated, the commit message is displayed instead.
-l <pattern>::
- List tags with names that match the given pattern (or all if no pattern is given).
- Typing "git tag" without arguments, also lists all tags.
+ List tags with names that match the given pattern (or all if no
+ pattern is given). Running "git tag" without arguments also
+ lists all tags. The pattern is a shell wildcard (i.e., matched
+ using fnmatch(3)). Multiple patterns may be given; if any of
+ them matches, the tag is shown.
--contains <commit>::
Only list tags which contain the specified commit.