X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-tag.txt;h=fa733214ab0259dec1c866e9cb629dd0e7b69f3a;hb=7d40f89137b456820d51ebc1cbb3ffbb966e7fec;hp=9712392f7946366129056ed8a0b7b8fab83c0ed5;hpb=92798702cf6d201f80e257a07d0a0c40565c79fe;p=git.git diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 9712392f7..fa733214a 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -9,10 +9,11 @@ git-tag - Create, list, delete or verify a tag object signed with GPG SYNOPSIS -------- [verse] -'git-tag' [-a | -s | -u ] [-f] [-m | -F ] [] -'git-tag' -d ... -'git-tag' [-n[]] -l [] -'git-tag' -v ... +'git tag' [-a | -s | -u ] [-f] [-m | -F ] + [ | ] +'git tag' -d ... +'git tag' [-n[]] -l [--contains ] [] +'git tag' -v ... DESCRIPTION ----------- @@ -62,14 +63,18 @@ OPTIONS 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. -l :: 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 :: + Only list tags which contain the specified commit. + -m :: Use the given tag message (instead of prompting). - If multiple `-m` options are given, there values are + If multiple `-m` options are given, their values are concatenated as separate paragraphs. Implies `-a` if none of `-a`, `-s`, or `-u ` is given. @@ -82,7 +87,7 @@ OPTIONS CONFIGURATION ------------- -By default, git-tag in sign-with-default mode (-s) will use your +By default, 'git-tag' in sign-with-default mode (-s) will use your committer identity (of the form "Your Name ") to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows: @@ -118,12 +123,12 @@ and be done with it. . The insane thing. You really want to call the new version "X" too, 'even though' -others have already seen the old one. So just use "git tag -f" +others have already seen the old one. So just use 'git-tag -f' again, as if you hadn't already published the old one. However, Git does *not* (and it should not) change tags behind -users back. So if somebody already got the old tag, doing a "git -pull" on your tree shouldn't just make them overwrite the old +users back. So if somebody already got the old tag, doing a +'git-pull' on your tree shouldn't just make them overwrite the old one. If somebody got a release tag from you, you cannot just change @@ -177,7 +182,7 @@ private anchor point tags from the other person. You would notice "please pull" messages on the mailing list says repo URL and branch name alone. This is designed to be easily -cut&pasted to "git fetch" command line: +cut&pasted to a 'git-fetch' command line: ------------ Linus, please pull from @@ -206,7 +211,7 @@ determines who are interested in whose tags. A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. "people who are -primarily interested in networking part of the kernel") who may +primarily interested in the networking part of the kernel") who may have their own set of tags (e.g. "this is the third release candidate from the networking group to be proposed for general consumption with 2.6.21 release") to another circle of people @@ -247,7 +252,7 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1 Author ------ Written by Linus Torvalds , -Junio C Hamano and Chris Wright . +Junio C Hamano and Chris Wright . Documentation -------------- @@ -255,4 +260,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list