From: Jari Aalto <jari.aalto@xxxxxxxxx> Signed-off-by: Jari Aalto <jari.aalto@xxxxxxxxx> --- Documentation/git-tag.txt | 49 +++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 8b169e3..bfdbb09 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -41,39 +41,37 @@ GnuPG key for signing. OPTIONS ------- + +-n<num>:: + <num> specifies how many lines from the annotation, if any, + are printed when using -l. + The default is not to print any annotation lines. + If no number is given to `-n`, only the first line is printed. + If the tag is not annotated, the commit message is displayed instead. + -a:: Make an unsigned, annotated tag object --s:: - Make a GPG-signed tag, using the default e-mail address's key +--contains <commit>:: + Only list tags which contain the specified commit. --u <key-id>:: - Make a GPG-signed tag, using the given key +-d:: + Delete existing tags with the given names. -f:: --force:: Replace an existing tag with the given name (instead of failing) --d:: - Delete existing tags with the given names. - --v:: - Verify the gpg signature of the given tag names. - --n<num>:: - <num> specifies how many lines from the annotation, if any, - are printed when using -l. - The default is not to print any annotation lines. - If no number is given to `-n`, only the first line is printed. - If the tag is not annotated, the commit message is displayed instead. +-F <file>:: + Take the tag message from the given file. Use '-' to + read the message from the standard input. + Implies `-a` if none of `-a`, `-s`, or `-u <key-id>` + is given. -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. ---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 @@ -81,11 +79,14 @@ OPTIONS Implies `-a` if none of `-a`, `-s`, or `-u <key-id>` is given. --F <file>:: - Take the tag message from the given file. Use '-' to - read the message from the standard input. - Implies `-a` if none of `-a`, `-s`, or `-u <key-id>` - is given. +-s:: + Make a GPG-signed tag, using the default e-mail address's key + +-u <key-id>:: + Make a GPG-signed tag, using the given key + +-v:: + Verify the gpg signature of the given tag names. <tagname>:: The name of the tag to create, delete, or describe. -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html