git-tag.txt 10.5 KB
Newer Older
J
Junio C Hamano 已提交
1 2
git-tag(1)
==========
3 4 5

NAME
----
6
git-tag - Create, list, delete or verify a tag object signed with GPG
7 8 9 10


SYNOPSIS
--------
11
[verse]
12
'git tag' [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
13 14
	<tagname> [<commit> | <object>]
'git tag' -d <tagname>...
T
Tom Grennan 已提交
15
'git tag' [-n[<num>]] -l [--contains <commit>] [--points-at <object>]
N
Nguyễn Thái Ngọc Duy 已提交
16
	[--column[=<options>] | --no-column] [<pattern>...]
17
'git tag' -v <tagname>...
18 19 20

DESCRIPTION
-----------
21

22
Add a tag reference in `refs/tags/`, unless `-d/-l/-v` is given
23
to delete, list or verify tags.
24

25
Unless `-f` is given, the named tag must not yet exist.
26

L
Linus Torvalds 已提交
27
If one of `-a`, `-s`, or `-u <key-id>` is passed, the command
28
creates a 'tag' object, and requires a tag message.  Unless
C
Carlos Rica 已提交
29
`-m <msg>` or `-F <file>` is given, an editor is started for the user to type
L
Linus Torvalds 已提交
30
in the tag message.
31

32 33 34
If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>`
are absent, `-a` is implied.

35
Otherwise just a tag reference for the SHA-1 object name of the commit object is
36
created (i.e. a lightweight tag).
L
Linus Torvalds 已提交
37 38 39 40

A GnuPG signed tag object will be created when `-s` or `-u
<key-id>` is used.  When `-u <key-id>` is not used, the
committer identity for the current user is used to find the
41 42 43
GnuPG key for signing. 	The configuration variable `gpg.program`
is used to specify custom GnuPG binary.

44
Tag objects (created with `-a`, `-s`, or `-u`) are called "annotated"
45 46 47 48 49 50 51 52 53 54
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).

Annotated tags are meant for release while lightweight tags are meant
for private or temporary object labels. For this reason, some git
commands for naming objects (like `git describe`) will ignore
lightweight tags by default.

55

56 57 58
OPTIONS
-------
-a::
59
--annotate::
60 61 62
	Make an unsigned, annotated tag object

-s::
63
--sign::
64
	Make a GPG-signed tag, using the default e-mail address's key.
65 66

-u <key-id>::
67
--local-user=<key-id>::
68
	Make a GPG-signed tag, using the given key.
69 70

-f::
71
--force::
72 73 74
	Replace an existing tag with the given name (instead of failing)

-d::
75
--delete::
76
	Delete existing tags with the given names.
77

S
Santi Béjar 已提交
78
-v::
79
--verify::
C
Carlos Rica 已提交
80
	Verify the gpg signature of the given tag names.
S
Santi Béjar 已提交
81

82
-n<num>::
83 84 85
	<num> specifies how many lines from the annotation, if any,
	are printed when using -l.
	The default is not to print any annotation lines.
C
Carlos Rica 已提交
86
	If no number is given to `-n`, only the first line is printed.
87
	If the tag is not annotated, the commit message is displayed instead.
88

89
-l <pattern>::
90
--list <pattern>::
91 92 93 94 95
	List tags with names that match the given pattern (or all if no
	pattern is given).  Running "git tag" without arguments also
	lists all tags. The pattern is a shell wildcard (i.e., matched
	using fnmatch(3)).  Multiple patterns may be given; if any of
	them matches, the tag is shown.
96

97 98 99
--sort=<type>::
	Sort in a specific order. Supported type is "refname"
	(lexicographic order), "version:refname" or "v:refname" (tag
100 101 102 103 104 105 106
	names are treated as versions). The "version:refname" sort
	order can also be affected by the
	"versionsort.prereleaseSuffix" configuration variable. Prepend
	"-" to reverse sort order. When this option is not given, the
	sort order defaults to the value configured for the 'tag.sort'
	variable if it exists, or lexicographic order otherwise. See
	linkgit:git-config[1].
107

N
Nguyễn Thái Ngọc Duy 已提交
108 109 110 111 112 113 114 115
--column[=<options>]::
--no-column::
	Display tag listing in columns. See configuration variable
	column.tag for option syntax.`--column` and `--no-column`
	without options are equivalent to 'always' and 'never' respectively.
+
This option is only applicable when listing tags without annotation lines.

116 117 118
--contains [<commit>]::
	Only list tags which contain the specified commit (HEAD if not
	specified).
J
Jake Goulding 已提交
119

T
Tom Grennan 已提交
120 121 122
--points-at <object>::
	Only list tags of the given object.

123
-m <msg>::
124
--message=<msg>::
125
	Use the given tag message (instead of prompting).
126
	If multiple `-m` options are given, their values are
127
	concatenated as separate paragraphs.
128 129
	Implies `-a` if none of `-a`, `-s`, or `-u <key-id>`
	is given.
130

131
-F <file>::
132
--file=<file>::
133 134
	Take the tag message from the given file.  Use '-' to
	read the message from the standard input.
135 136
	Implies `-a` if none of `-a`, `-s`, or `-u <key-id>`
	is given.
137

138 139 140 141 142 143 144
--cleanup=<mode>::
	This option sets how the tag message is cleaned up.
	The  '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'.  The
	'strip' mode is default. The 'verbatim' mode does not change message at
	all, 'whitespace' removes just leading/trailing whitespace lines and
	'strip' removes both whitespace and commentary.

145 146 147 148 149 150
<tagname>::
	The name of the tag to create, delete, or describe.
	The new tag name must pass all checks defined by
	linkgit:git-check-ref-format[1].  Some of these checks
	may restrict the characters allowed in a tag name.

T
Thomas Rast 已提交
151 152 153 154 155 156
<commit>::
<object>::
	The object that the new tag will refer to, usually a commit.
	Defaults to HEAD.


157 158
CONFIGURATION
-------------
159
By default, 'git tag' in sign-with-default mode (-s) will use your
160
committer identity (of the form `Your Name <your@email.address>`) to
161 162 163
find a key.  If you want to use a different default key, you can specify
it in the repository configuration as follows:

164
-------------------------------------
165
[user]
166
    signingKey = <gpg-key-id>
167
-------------------------------------
168

169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194

DISCUSSION
----------

On Re-tagging
~~~~~~~~~~~~~

What should you do when you tag a wrong commit and you would
want to re-tag?

If you never pushed anything out, just re-tag it. Use "-f" to
replace the old one. And you're done.

But if you have pushed things out (or others could just read
your repository directly), then others will have already seen
the old tag. In that case you can do one of two things:

. The sane thing.
Just admit you screwed up, and use a different name. Others have
already seen one tag-name, and if you keep the same name, you
may be in the situation that two people both have "version X",
but they actually have 'different' "X"'s.  So just call it "X.1"
and be done with it.

. The insane thing.
You really want to call the new version "X" too, 'even though'
195
others have already seen the old one. So just use 'git tag -f'
196 197
again, as if you hadn't already published the old one.

198
However, Git does *not* (and it should not) change tags behind
199
users back. So if somebody already got the old tag, doing a
200
'git pull' on your tree shouldn't just make them overwrite the old
201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227
one.

If somebody got a release tag from you, you cannot just change
the tag for them by updating your own one. This is a big
security issue, in that people MUST be able to trust their
tag-names.  If you really want to do the insane thing, you need
to just fess up to it, and tell people that you messed up. You
can do that by making a very public announcement saying:

------------
Ok, I messed up, and I pushed out an earlier version tagged as X. I
then fixed something, and retagged the *fixed* tree as X again.

If you got the wrong tag, and want the new one, please delete
the old one and fetch the new one by doing:

	git tag -d X
	git fetch origin tag X

to get my updated tag.

You can test which tag you have by doing

	git rev-parse X

which should return 0123456789abcdef.. if you have the new version.

228
Sorry for the inconvenience.
229 230 231
------------

Does this seem a bit complicated?  It *should* be. There is no
232 233
way that it would be correct to just "fix" it automatically.
People need to know that their tags might have been changed.
234 235 236 237 238 239


On Automatic following
~~~~~~~~~~~~~~~~~~~~~~

If you are following somebody else's tree, you are most likely
240
using remote-tracking branches (`refs/heads/origin` in traditional
241 242 243 244 245 246 247 248 249 250
layout, or `refs/remotes/origin/master` in the separate-remote
layout).  You usually want the tags from the other end.

On the other hand, if you are fetching because you would want a
one-shot merge from somebody else, you typically do not want to
get tags from there.  This happens more often for people near
the toplevel but not limited to them.  Mere mortals when pulling
from each other do not necessarily want to automatically get
private anchor point tags from the other person.

251 252 253 254
Often, "please pull" messages on the mailing list just provide
two pieces of information: a repo URL and a branch name; this
is designed to be easily cut&pasted at the end of a 'git fetch'
command line:
255 256 257 258 259 260 261 262 263 264 265 266 267 268 269

------------
Linus, please pull from

	git://git..../proj.git master

to get the following updates...
------------

becomes:

------------
$ git pull git://git..../proj.git master
------------

270 271
In such a case, you do not want to automatically follow the other
person's tags.
272

273
One important aspect of Git is its distributed nature, which
274
largely means there is no inherent "upstream" or
275 276
"downstream" in the system.  On the face of it, the above
example might seem to indicate that the tag namespace is owned
277
by the upper echelon of people and that tags only flow downwards, but
278 279 280 281 282
that is not the case.  It only shows that the usage pattern
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
283
primarily interested in the networking part of the kernel") who may
284 285 286 287 288 289 290 291 292 293 294
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
(e.g. "people who integrate various subsystem improvements").
The latter are usually not interested in the detailed tags used
internally in the former group (that is what "internal" means).
That is why it is desirable not to follow tags automatically in
this case.

It may well be that among networking people, they may want to
exchange the tags internal to their group, but in that workflow
295
they are most likely tracking each other's progress by
296
having remote-tracking branches.  Again, the heuristic to automatically
297 298 299
follow such tags is a good thing.


300 301 302 303 304
On Backdating Tags
~~~~~~~~~~~~~~~~~~

If you have imported some changes from another VCS and would like
to add tags for major releases of your work, it is useful to be able
305
to specify the date to embed inside of the tag object; such data in
306 307 308 309
the tag object affects, for example, the ordering of tags in the
gitweb interface.

To set the date used in future tag objects, set the environment
310 311
variable GIT_COMMITTER_DATE (see the later discussion of possible
values; the most common form is "YYYY-MM-DD HH:MM").
312

313
For example:
314 315

------------
316
$ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1
317 318
------------

319
include::date-formats.txt[]
320

321 322 323
SEE ALSO
--------
linkgit:git-check-ref-format[1].
324
linkgit:git-config[1].
325

326 327
GIT
---
328
Part of the linkgit:git[1] suite