Merge branch 'ph/submodule-rebase' (early part)

[git.git] / Documentation / git-tag.txt

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 3546acffb5197ac2ed1a542607fc244bc31b3ae3..fa733214ab0259dec1c866e9cb629dd0e7b69f3a 100644 (file)
--- 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>]
        <name> [<commit> | <object>]
 'git tag' -d <name>...
 'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
        <name> [<commit> | <object>]
 'git tag' -d <name>...

-'git tag' [-n[<num>]] -l [<pattern>]
+'git tag' [-n[<num>]] -l [--contains <commit>] [<pattern>]

 'git tag' -v <name>...
 
 DESCRIPTION
 'git tag' -v <name>...
 
 DESCRIPTION


@@ -69,6 +69,9 @@ OPTIONS
        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).
        Typing "git tag" without arguments, also lists all tags.
 

+--contains <commit>::
+       Only list tags which contain the specified commit.
+

 -m <msg>::
        Use the given tag message (instead of prompting).
        If multiple `-m` options are given, their values are
 -m <msg>::
        Use the given tag message (instead of prompting).
        If multiple `-m` options are given, their values are