diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-18 16:43:11 -0800 |
| commit | 9d9711544dc3090db6e5c52f9ce9c300bf4f5c14 (patch) | |
| tree | 23257b9801739fd96c9e82ef98a17500dce9f88e /git-tag.html | |
| parent | 9629d4f49e5ffcff5c5beb5c40bedcffcabcd905 (diff) | |
| download | git-htmldocs-9d9711544dc3090db6e5c52f9ce9c300bf4f5c14.tar.gz | |
Autogenerated HTML docs for v1.8.1-rc2-5-g252f9
Diffstat (limited to 'git-tag.html')
| -rw-r--r-- | git-tag.html | 478 |
1 files changed, 331 insertions, 147 deletions
diff --git a/git-tag.html b/git-tag.html index 023c2f4a6..424660d9b 100644 --- a/git-tag.html +++ b/git-tag.html @@ -2,15 +2,25 @@ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.5.2" />
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.8" />
<title>git-tag(1)</title>
<style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
-/*
- border: 1px solid red;
-*/
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
+
+/* Default font. */
+body {
+ font-family: Georgia,serif;
+}
+
+/* Title font. */
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+ font-family: Arial,Helvetica,sans-serif;
}
body {
@@ -35,13 +45,8 @@ strong { color: #083194;
}
-tt {
- color: navy;
-}
-
h1, h2, h3, h4, h5, h6 {
color: #527bbd;
- font-family: sans-serif;
margin-top: 1.2em;
margin-bottom: 0.5em;
line-height: 1.3;
@@ -59,9 +64,11 @@ h3 { h3 + * {
clear: left;
}
+h5 {
+ font-size: 1.0em;
+}
div.sectionbody {
- font-family: serif;
margin-left: 0;
}
@@ -77,45 +84,48 @@ p { ul, ol, li > p {
margin-top: 0;
}
+ul > li { color: #aaa; }
+ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
-span#author {
+
+#author {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
font-size: 1.1em;
}
-span#email {
+#email {
}
-span#revnumber, span#revdate, span#revremark {
- font-family: sans-serif;
+#revnumber, #revdate, #revremark {
}
-div#footer {
- font-family: sans-serif;
+#footer {
font-size: small;
border-top: 2px solid silver;
padding-top: 0.5em;
margin-top: 4.0em;
}
-div#footer-text {
+#footer-text {
float: left;
padding-bottom: 0.5em;
}
-div#footer-badges {
+#footer-badges {
float: right;
padding-bottom: 0.5em;
}
-div#preamble {
+#preamble {
margin-top: 1.5em;
margin-bottom: 1.5em;
}
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
margin-top: 1.0em;
@@ -135,7 +145,6 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
color: #527bbd;
- font-family: sans-serif;
font-weight: bold;
text-align: left;
margin-top: 1.0em;
@@ -157,13 +166,15 @@ div.content + div.title { div.sidebarblock > div.content {
background: #ffffee;
- border: 1px solid silver;
+ border: 1px solid #dddddd;
+ border-left: 4px solid #f0f0f0;
padding: 0.5em;
}
div.listingblock > div.content {
- border: 1px solid silver;
- background: #f4f4f4;
+ border: 1px solid #dddddd;
+ border-left: 5px solid #f0f0f0;
+ background: #f8f8f8;
padding: 0.5em;
}
@@ -171,8 +182,8 @@ div.quoteblock, div.verseblock { padding-left: 1.0em;
margin-left: 1.0em;
margin-right: 10%;
- border-left: 5px solid #dddddd;
- color: #777777;
+ border-left: 5px solid #f0f0f0;
+ color: #888;
}
div.quoteblock > div.attribution {
@@ -180,8 +191,9 @@ div.quoteblock > div.attribution { text-align: right;
}
-div.verseblock > div.content {
- white-space: pre;
+div.verseblock > pre.content {
+ font-family: inherit;
+ font-size: inherit;
}
div.verseblock > div.attribution {
padding-top: 0.75em;
@@ -254,35 +266,12 @@ div.compact div, div.compact div { margin-bottom: 0.1em;
}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-family: sans-serif;
- font-weight: bold;
-}
tfoot {
font-weight: bold;
}
td > div.verse {
white-space: pre;
}
-p.table {
- margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock > table[frame="void"] {
- border-style: none;
-}
-div.tableblock > table[frame="hsides"] {
- border-left-style: none;
- border-right-style: none;
-}
-div.tableblock > table[frame="vsides"] {
- border-top-style: none;
- border-bottom-style: none;
-}
-
div.hdlist {
margin-top: 0.8em;
@@ -339,25 +328,32 @@ span.footnote, span.footnoteref { min-width: 100px;
}
+div.colist td {
+ padding-right: 0.5em;
+ padding-bottom: 0.3em;
+ vertical-align: top;
+}
+div.colist td img {
+ margin-top: 0.3em;
+}
@media print {
- div#footer-badges { display: none; }
+ #footer-badges { display: none; }
}
-div#toc {
+#toc {
margin-bottom: 2.5em;
}
-div#toctitle {
+#toctitle {
color: #527bbd;
- font-family: sans-serif;
font-size: 1.1em;
font-weight: bold;
margin-top: 1.0em;
margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -373,69 +369,173 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-/* Overrides for manpage documents */
-h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
+
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+span.underline { text-decoration: underline; }
+span.overline { text-decoration: overline; }
+span.line-through { text-decoration: line-through; }
+
+div.unbreakable { page-break-inside: avoid; }
+
+
+/*
+ * xhtml11 specific
+ *
+ * */
+
+div.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-h2 {
+div.tableblock > table {
+ border: 3px solid #527bbd;
+}
+thead, p.table.header {
+ font-weight: bold;
+ color: #527bbd;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
border-style: none;
}
-div.sectionbody {
- margin-left: 5%;
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
}
-
-@media print {
- div#toc { display: none; }
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
}
-/* Workarounds for IE6's broken and incomplete CSS2. */
-div.sidebar-content {
- background: #ffffee;
- border: 1px solid silver;
- padding: 0.5em;
+/*
+ * html5 specific
+ *
+ * */
+
+table.tableblock {
+ margin-top: 1.0em;
+ margin-bottom: 1.5em;
}
-div.sidebar-title, div.image-title {
- color: #527bbd;
- font-family: sans-serif;
+thead, p.tableblock.header {
font-weight: bold;
- margin-top: 0.0em;
- margin-bottom: 0.5em;
+ color: #527bbd;
+}
+p.tableblock {
+ margin-top: 0;
+}
+table.tableblock {
+ border-width: 3px;
+ border-spacing: 0px;
+ border-style: solid;
+ border-color: #527bbd;
+ border-collapse: collapse;
+}
+th.tableblock, td.tableblock {
+ border-width: 1px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #527bbd;
}
-div.listingblock div.content {
- border: 1px solid silver;
- background: #f4f4f4;
- padding: 0.5em;
+table.tableblock.frame-topbot {
+ border-left-style: hidden;
+ border-right-style: hidden;
+}
+table.tableblock.frame-sides {
+ border-top-style: hidden;
+ border-bottom-style: hidden;
+}
+table.tableblock.frame-none {
+ border-style: hidden;
}
-div.quoteblock-attribution {
- padding-top: 0.5em;
+th.tableblock.halign-left, td.tableblock.halign-left {
+ text-align: left;
+}
+th.tableblock.halign-center, td.tableblock.halign-center {
+ text-align: center;
+}
+th.tableblock.halign-right, td.tableblock.halign-right {
text-align: right;
}
-div.verseblock-content {
- white-space: pre;
+th.tableblock.valign-top, td.tableblock.valign-top {
+ vertical-align: top;
}
-div.verseblock-attribution {
- padding-top: 0.75em;
- text-align: left;
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+ vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+ vertical-align: bottom;
}
-div.exampleblock-content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
+
+/*
+ * manpage specific
+ *
+ * */
+
+body.manpage h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+body.manpage h2 {
+ border-style: none;
}
+body.manpage div.sectionbody {
+ margin-left: 3em;
+}
+
+@media print {
+ body.manpage div#toc { display: none; }
+}
+
-/* IE6 sets dynamically generated links as visited. */
-div#toc a:visited { color: blue; }
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -497,6 +597,25 @@ toc: function (toclevels) { }
var toc = document.getElementById("toc");
+ if (!toc) {
+ return;
+ }
+
+ // Delete existing TOC entries in case we're reloading the TOC.
+ var tocEntriesToRemove = [];
+ var i;
+ for (i = 0; i < toc.childNodes.length; i++) {
+ var entry = toc.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div'
+ && entry.getAttribute("class")
+ && entry.getAttribute("class").match(/^toclevel/))
+ tocEntriesToRemove.push(entry);
+ }
+ for (i = 0; i < tocEntriesToRemove.length; i++) {
+ toc.removeChild(tocEntriesToRemove[i]);
+ }
+
+ // Rebuild TOC entries.
var entries = tocEntries(document.getElementById("content"), toclevels);
for (var i = 0; i < entries.length; ++i) {
var entry = entries[i];
@@ -524,24 +643,44 @@ toc: function (toclevels) { */
footnotes: function () {
- var cont = document.getElementById("content");
+ // Delete existing footnote entries in case we're reloading the footnodes.
+ var i;
var noteholder = document.getElementById("footnotes");
+ if (!noteholder) {
+ return;
+ }
+ var entriesToRemove = [];
+ for (i = 0; i < noteholder.childNodes.length; i++) {
+ var entry = noteholder.childNodes[i];
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
+ entriesToRemove.push(entry);
+ }
+ for (i = 0; i < entriesToRemove.length; i++) {
+ noteholder.removeChild(entriesToRemove[i]);
+ }
+
+ // Rebuild footnote entries.
+ var cont = document.getElementById("content");
var spans = cont.getElementsByTagName("span");
var refs = {};
var n = 0;
for (i=0; i<spans.length; i++) {
if (spans[i].className == "footnote") {
n++;
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ var note = spans[i].getAttribute("data-note");
+ if (!note) {
+ // Use [\s\S] in place of . so multi-line matches work.
+ // Because JavaScript has no s (dotall) regex flag.
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+ spans[i].innerHTML =
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+ "' title='View footnote' class='footnote'>" + n + "</a>]";
+ spans[i].setAttribute("data-note", note);
+ }
noteholder.innerHTML +=
"<div class='footnote' id='_footnote_" + n + "'>" +
"<a href='#_footnoteref_" + n + "' title='Return to text'>" +
n + "</a>. " + note + "</div>";
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
var id =spans[i].getAttribute("id");
if (id != null) refs["#"+id] = n;
}
@@ -561,13 +700,36 @@ footnotes: function () { }
}
}
+},
+
+install: function(toclevels) {
+ var timerId;
+
+ function reinstall() {
+ asciidoc.footnotes();
+ if (toclevels) {
+ asciidoc.toc(toclevels);
+ }
+ }
+
+ function reinstallAndRemoveTimer() {
+ clearInterval(timerId);
+ reinstall();
+ }
+
+ timerId = setInterval(reinstall, 500);
+ if (document.addEventListener)
+ document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+ else
+ window.onload = reinstallAndRemoveTimer;
}
}
+asciidoc.install();
/*]]>*/
</script>
</head>
-<body>
+<body class="manpage">
<div id="header">
<h1>
git-tag(1) Manual Page
@@ -580,38 +742,43 @@ git-tag(1) Manual Page </div>
</div>
<div id="content">
+<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="verseblock-content"><em>git tag</em> [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
+<pre class="content"><em>git tag</em> [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]
<tagname> [<commit> | <object>]
<em>git tag</em> -d <tagname>…
<em>git tag</em> [-n[<num>]] -l [--contains <commit>] [--points-at <object>]
[--column[=<options>] | --no-column] [<pattern>…]
[<pattern>…]
-<em>git tag</em> -v <tagname>…</div>
-<div class="verseblock-attribution">
+<em>git tag</em> -v <tagname>…</pre>
+<div class="attribution">
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Add a tag reference in <tt>refs/tags/</tt>, unless <tt>-d/-l/-v</tt> is given
+<div class="paragraph"><p>Add a tag reference in <code>refs/tags/</code>, unless <code>-d/-l/-v</code> is given
to delete, list or verify tags.</p></div>
-<div class="paragraph"><p>Unless <tt>-f</tt> is given, the named tag must not yet exist.</p></div>
-<div class="paragraph"><p>If one of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u <key-id></tt> is passed, the command
+<div class="paragraph"><p>Unless <code>-f</code> is given, the named tag must not yet exist.</p></div>
+<div class="paragraph"><p>If one of <code>-a</code>, <code>-s</code>, or <code>-u <key-id></code> is passed, the command
creates a <em>tag</em> object, and requires a tag message. Unless
-<tt>-m <msg></tt> or <tt>-F <file></tt> is given, an editor is started for the user to type
+<code>-m <msg></code> or <code>-F <file></code> is given, an editor is started for the user to type
in the tag message.</p></div>
-<div class="paragraph"><p>If <tt>-m <msg></tt> or <tt>-F <file></tt> is given and <tt>-a</tt>, <tt>-s</tt>, and <tt>-u <key-id></tt>
-are absent, <tt>-a</tt> is implied.</p></div>
+<div class="paragraph"><p>If <code>-m <msg></code> or <code>-F <file></code> is given and <code>-a</code>, <code>-s</code>, and <code>-u <key-id></code>
+are absent, <code>-a</code> is implied.</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
-<key-id></tt> is used. When <tt>-u <key-id></tt> is not used, the
+<div class="paragraph"><p>A GnuPG signed tag object will be created when <code>-s</code> or <code>-u
+<key-id></code> is used. When <code>-u <key-id></code> is not used, the
committer identity for the current user is used to find the
-GnuPG key for signing. The configuration variable <tt>gpg.program</tt>
+GnuPG key for signing. The configuration variable <code>gpg.program</code>
is used to specify custom GnuPG binary.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
@@ -689,7 +856,7 @@ is used to specify custom GnuPG binary.</p></div> <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 <tt>-n</tt>, only the first line is printed.
+ If no number is given to <code>-n</code>, only the first line is printed.
If the tag is not annotated, the commit message is displayed instead.
</p>
</dd>
@@ -717,7 +884,7 @@ is used to specify custom GnuPG binary.</p></div> <dd>
<p>
Display tag listing in columns. See configuration variable
- column.tag for option syntax.<tt>--column</tt> and <tt>--no-column</tt>
+ column.tag for option syntax.<code>--column</code> and <code>--no-column</code>
without options are equivalent to <em>always</em> and <em>never</em> respectively.
</p>
<div class="paragraph"><p>This option is only applicable when listing tags without annotation lines.</p></div>
@@ -747,9 +914,9 @@ is used to specify custom GnuPG binary.</p></div> <dd>
<p>
Use the given tag message (instead of prompting).
- If multiple <tt>-m</tt> options are given, their values are
+ If multiple <code>-m</code> options are given, their values are
concatenated as separate paragraphs.
- Implies <tt>-a</tt> if none of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u <key-id></tt>
+ Implies <code>-a</code> if none of <code>-a</code>, <code>-s</code>, or <code>-u <key-id></code>
is given.
</p>
</dd>
@@ -763,7 +930,7 @@ is used to specify custom GnuPG binary.</p></div> <p>
Take the tag message from the given file. Use <em>-</em> to
read the message from the standard input.
- Implies <tt>-a</tt> if none of <tt>-a</tt>, <tt>-s</tt>, or <tt>-u <key-id></tt>
+ Implies <code>-a</code> if none of <code>-a</code>, <code>-s</code>, or <code>-u <key-id></code>
is given.
</p>
</dd>
@@ -792,6 +959,8 @@ is used to specify custom GnuPG binary.</p></div> </dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
<div class="paragraph"><p>By default, <em>git tag</em> in sign-with-default mode (-s) will use your
@@ -800,13 +969,16 @@ find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>[user]
- signingkey = <gpg-key-id></tt></pre>
+<pre><code>[user]
+ signingkey = <gpg-key-id></code></pre>
</div></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_discussion">DISCUSSION</h2>
<div class="sectionbody">
-<h3 id="_on_re_tagging">On Re-tagging</h3><div style="clear:left"></div>
+<div class="sect2">
+<h3 id="_on_re_tagging">On Re-tagging</h3>
<div class="paragraph"><p>What should you do when you tag a wrong commit and you would
want to re-tag?</p></div>
<div class="paragraph"><p>If you never pushed anything out, just re-tag it. Use "-f" to
@@ -846,7 +1018,7 @@ to just fess up to it, and tell people that you messed up. You can do that by making a very public announcement saying:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>Ok, I messed up, and I pushed out an earlier version tagged as X. I
+<pre><code>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
@@ -863,15 +1035,17 @@ You can test which tag you have by doing which should return 0123456789abcdef.. if you have the new version.
-Sorry for the inconvenience.</tt></pre>
+Sorry for the inconvenience.</code></pre>
</div></div>
<div class="paragraph"><p>Does this seem a bit complicated? It <strong>should</strong> be. There is no
way that it would be correct to just "fix" it automatically.
People need to know that their tags might have been changed.</p></div>
-<h3 id="_on_automatic_following">On Automatic following</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_on_automatic_following">On Automatic following</h3>
<div class="paragraph"><p>If you are following somebody else’s tree, you are most likely
-using remote-tracking branches (<tt>refs/heads/origin</tt> in traditional
-layout, or <tt>refs/remotes/origin/master</tt> in the separate-remote
+using remote-tracking branches (<code>refs/heads/origin</code> in traditional
+layout, or <code>refs/remotes/origin/master</code> in the separate-remote
layout). You usually want the tags from the other end.</p></div>
<div class="paragraph"><p>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
@@ -885,16 +1059,16 @@ is designed to be easily cut&pasted at the end of a <em>git fetch</em> command line:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>Linus, please pull from
+<pre><code>Linus, please pull from
git://git..../proj.git master
-to get the following updates...</tt></pre>
+to get the following updates...</code></pre>
</div></div>
<div class="paragraph"><p>becomes:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git pull git://git..../proj.git master</tt></pre>
+<pre><code>$ git pull git://git..../proj.git master</code></pre>
</div></div>
<div class="paragraph"><p>In such a case, you do not want to automatically follow the other
person’s tags.</p></div>
@@ -921,7 +1095,9 @@ exchange the tags internal to their group, but in that workflow they are most likely tracking each other’s progress by
having remote-tracking branches. Again, the heuristic to automatically
follow such tags is a good thing.</p></div>
-<h3 id="_on_backdating_tags">On Backdating Tags</h3><div style="clear:left"></div>
+</div>
+<div class="sect2">
+<h3 id="_on_backdating_tags">On Backdating Tags</h3>
<div class="paragraph"><p>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
to specify the date to embed inside of the tag object; such data in
@@ -933,9 +1109,12 @@ values; the most common form is "YYYY-MM-DD HH:MM").</p></div> <div class="paragraph"><p>For example:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1</tt></pre>
+<pre><code>$ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1</code></pre>
</div></div>
</div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_date_formats">DATE FORMATS</h2>
<div class="sectionbody">
<div class="paragraph"><p>The GIT_AUTHOR_DATE, GIT_COMMITTER_DATE environment variables
@@ -946,10 +1125,10 @@ Git internal format </dt>
<dd>
<p>
- It is <tt><unix timestamp> <timezone offset></tt>, where <tt><unix
- timestamp></tt> is the number of seconds since the UNIX epoch.
- <tt><timezone offset></tt> is a positive or negative offset from UTC.
- For example CET (which is 2 hours ahead UTC) is <tt>+0200</tt>.
+ It is <code><unix timestamp> <timezone offset></code>, where <code><unix
+ timestamp></code> is the number of seconds since the UNIX epoch.
+ <code><timezone offset></code> is a positive or negative offset from UTC.
+ For example CET (which is 2 hours ahead UTC) is <code>+0200</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -958,7 +1137,7 @@ RFC 2822 <dd>
<p>
The standard email format as described by RFC 2822, for example
- <tt>Thu, 07 Apr 2005 22:13:13 +0200</tt>.
+ <code>Thu, 07 Apr 2005 22:13:13 +0200</code>.
</p>
</dd>
<dt class="hdlist1">
@@ -967,8 +1146,8 @@ ISO 8601 <dd>
<p>
Time and date specified by the ISO 8601 standard, for example
- <tt>2005-04-07T22:13:13</tt>. The parser accepts a space instead of the
- <tt>T</tt> character as well.
+ <code>2005-04-07T22:13:13</code>. The parser accepts a space instead of the
+ <code>T</code> character as well.
</p>
<div class="admonitionblock">
<table><tr>
@@ -976,21 +1155,26 @@ ISO 8601 <div class="title">Note</div>
</td>
<td class="content">In addition, the date part is accepted in the following formats:
-<tt>YYYY.MM.DD</tt>, <tt>MM/DD/YYYY</tt> and <tt>DD.MM.YYYY</tt>.</td>
+<code>YYYY.MM.DD</code>, <code>MM/DD/YYYY</code> and <code>DD.MM.YYYY</code>.</td>
</tr></table>
</div>
</dd>
</dl></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-check-ref-format.html">git-check-ref-format(1)</a>.</p></div>
</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
+</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
|