git-ls-files.txt: clarify what "other files" mean for --other

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

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 3546acffb5197ac2ed1a542607fc244bc31b3ae3..1118ce22dcfcbaf190bd7abc60c2b33c213acd06 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -12,12 +12,15 @@ 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
 -----------

-Adds a 'tag' reference in `.git/refs/tags/`
+
+Adds a 'tag' reference in `.git/refs/tags/`.  The tag <name> must pass
+linkgit:git-check-ref-format[1] which basicly means that control characters,
+space, ~, ^, :, ?, *, [ and \ are prohibited.

 
 Unless `-f` is given, the tag must not yet exist in
 `.git/refs/tags/` directory.
 
 Unless `-f` is given, the tag must not yet exist in
 `.git/refs/tags/` directory.


@@ -69,6 +72,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