diff options
Diffstat (limited to 'man1/git-tag.1')
| -rw-r--r-- | man1/git-tag.1 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/man1/git-tag.1 b/man1/git-tag.1 index a7cc5b4e9..b949a069e 100644 --- a/man1/git-tag.1 +++ b/man1/git-tag.1 @@ -2,12 +2,12 @@ .\" Title: git-tag .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 10/27/2022 +.\" Date: 10/28/2022 .\" Manual: Git Manual -.\" Source: Git 2.38.1.236.g5af5e54106 +.\" Source: Git 2.38.1.280.g63bba4fdd8 .\" Language: English .\" -.TH "GIT\-TAG" "1" "10/27/2022" "Git 2\&.38\&.1\&.236\&.g5af5e5" "Git Manual" +.TH "GIT\-TAG" "1" "10/28/2022" "Git 2\&.38\&.1\&.280\&.g63bba4" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -32,7 +32,7 @@ git-tag \- Create, list, delete or verify a tag object signed with GPG .SH "SYNOPSIS" .sp .nf -\fIgit tag\fR [\-a | \-s | \-u <keyid>] [\-f] [\-m <msg> | \-F <file>] [\-e] +\fIgit tag\fR [\-a | \-s | \-u <key\-id>] [\-f] [\-m <msg> | \-F <file>] [\-e] <tagname> [<commit> | <object>] \fIgit tag\fR \-d <tagname>\&... \fIgit tag\fR [\-n[<num>]] \-l [\-\-contains <commit>] [\-\-no\-contains <commit>] @@ -48,13 +48,13 @@ Add a tag reference in \fBrefs/tags/\fR, unless \fB\-d/\-l/\-v\fR is given to de .sp Unless \fB\-f\fR is given, the named tag must not yet exist\&. .sp -If one of \fB\-a\fR, \fB\-s\fR, or \fB\-u <keyid>\fR is passed, the command creates a \fItag\fR object, and requires a tag message\&. Unless \fB\-m <msg>\fR or \fB\-F <file>\fR is given, an editor is started for the user to type in the tag message\&. +If one of \fB\-a\fR, \fB\-s\fR, or \fB\-u <key\-id>\fR is passed, the command creates a \fItag\fR object, and requires a tag message\&. Unless \fB\-m <msg>\fR or \fB\-F <file>\fR is given, an editor is started for the user to type in the tag message\&. .sp -If \fB\-m <msg>\fR or \fB\-F <file>\fR is given and \fB\-a\fR, \fB\-s\fR, and \fB\-u <keyid>\fR are absent, \fB\-a\fR is implied\&. +If \fB\-m <msg>\fR or \fB\-F <file>\fR is given and \fB\-a\fR, \fB\-s\fR, and \fB\-u <key\-id>\fR are absent, \fB\-a\fR is implied\&. .sp Otherwise, a tag reference that points directly at the given object (i\&.e\&., a lightweight tag) is created\&. .sp -A GnuPG signed tag object will be created when \fB\-s\fR or \fB\-u <keyid>\fR is used\&. When \fB\-u <keyid>\fR is not used, the committer identity for the current user is used to find the GnuPG key for signing\&. The configuration variable \fBgpg\&.program\fR is used to specify custom GnuPG binary\&. +A GnuPG signed tag object will be created when \fB\-s\fR or \fB\-u <key\-id>\fR is used\&. When \fB\-u <key\-id>\fR is not used, the committer identity for the current user is used to find the GnuPG key for signing\&. The configuration variable \fBgpg\&.program\fR is used to specify custom GnuPG binary\&. .sp Tag objects (created with \fB\-a\fR, \fB\-s\fR, or \fB\-u\fR) are called "annotated" tags; they contain a creation date, the tagger name and e\-mail, a tagging message, and an optional GnuPG signature\&. Whereas a "lightweight" tag is simply a name for an object (usually a commit object)\&. .sp @@ -81,7 +81,7 @@ Override configuration variable that is set to force each and every tag to be signed\&. .RE .PP -\-u <keyid>, \-\-local\-user=<keyid> +\-u <key\-id>, \-\-local\-user=<key\-id> .RS 4 Make a GPG\-signed tag, using the given key\&. .RE @@ -212,7 +212,7 @@ options are given, their values are concatenated as separate paragraphs\&. Impli if none of \fB\-a\fR, \fB\-s\fR, or -\fB\-u <keyid>\fR +\fB\-u <key\-id>\fR is given\&. .RE .PP @@ -225,7 +225,7 @@ to read the message from the standard input\&. Implies if none of \fB\-a\fR, \fB\-s\fR, or -\fB\-u <keyid>\fR +\fB\-u <key\-id>\fR is given\&. .RE .PP @@ -297,7 +297,7 @@ By default, \fIgit tag\fR in sign\-with\-default mode (\-s) will use your commit .\} .nf [user] - signingKey = <gpg\-keyid> + signingKey = <gpg\-key_id> .fi .if n \{\ .RE |