summaryrefslogtreecommitdiffstats
path: root/git-tag.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-02-15 22:08:33 +0000
committerJunio C Hamano <junio@kernel.org>2011-02-15 22:08:33 +0000
commit25c766e9a8b9605170ac163df933da0c7f0bc5ae (patch)
tree6c988ea184b3660b50f05a68e151dedc33ac1e4d /git-tag.html
parent51f3c5a63233acabaf7cce74a8339d8a4ea77dd4 (diff)
downloadgit-htmldocs-25c766e9a8b9605170ac163df933da0c7f0bc5ae.tar.gz
Autogenerated HTML docs for v1.7.4.1-42-g43f9f
Diffstat (limited to 'git-tag.html')
-rw-r--r--git-tag.html13
1 files changed, 7 insertions, 6 deletions
diff --git a/git-tag.html b/git-tag.html
index 367b2aff3..95dc119b8 100644
--- a/git-tag.html
+++ b/git-tag.html
@@ -425,17 +425,18 @@ git-tag(1) Manual Page
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Adds a tag reference in <tt>.git/refs/tags/</tt>.</p></div>
-<div class="paragraph"><p>Unless <tt>-f</tt> is given, the tag must not yet exist in
+<div class="paragraph"><p>Add a tag reference in <tt>.git/refs/tags/</tt>, unless <tt>-d/-l/-v</tt> is given
+to delete, list or verify tags.</p></div>
+<div class="paragraph"><p>Unless <tt>-f</tt> is given, the tag to be created must not yet exist in the
<tt>.git/refs/tags/</tt> directory.</p></div>
<div class="paragraph"><p>If one of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u &lt;key-id&gt;</tt> is passed, the command
-creates a <em>tag</em> object, and requires the tag message. Unless
+creates a <em>tag</em> object, and requires a tag message. Unless
<tt>-m &lt;msg&gt;</tt> or <tt>-F &lt;file&gt;</tt> is given, an editor is started for the user to type
in the tag message.</p></div>
<div class="paragraph"><p>If <tt>-m &lt;msg&gt;</tt> or <tt>-F &lt;file&gt;</tt> is given and <tt>-a</tt>, <tt>-s</tt>, and <tt>-u &lt;key-id&gt;</tt>
are absent, <tt>-a</tt> is implied.</p></div>
-<div class="paragraph"><p>Otherwise just the SHA1 object name of the commit object is
-written (i.e. a lightweight tag).</p></div>
+<div class="paragraph"><p>Otherwise just a tag reference for the SHA1 object name of the commit object is
+created (i.e. a lightweight tag).</p></div>
<div class="paragraph"><p>A GnuPG signed tag object will be created when <tt>-s</tt> or <tt>-u
&lt;key-id&gt;</tt> is used. When <tt>-u &lt;key-id&gt;</tt> is not used, the
committer identity for the current user is used to find the
@@ -724,7 +725,7 @@ Junio C Hamano &lt;<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>&gt;
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-11-25 03:13:43 UTC
+Last updated 2011-02-15 22:08:10 UTC
</div>
</div>
</body>