summaryrefslogtreecommitdiffstats
path: root/git-describe.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-07-02 03:06:38 +0000
commitfce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch)
treeffce2ae419b52786a0e567f4fddaadd89016f62c /git-describe.html
parentbb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff)
downloadgit-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'git-describe.html')
-rw-r--r--git-describe.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/git-describe.html b/git-describe.html
index 751808168..d5b85a72b 100644
--- a/git-describe.html
+++ b/git-describe.html
@@ -272,7 +272,7 @@ git-describe(1) Manual Page
</div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<p><em>git-describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] &lt;committish&gt;&#8230;</p>
+<p><em>git describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] &lt;committish&gt;&#8230;</p>
</div>
<h2>DESCRIPTION</h2>
<div class="sectionbody">
@@ -399,7 +399,7 @@ abbreviated object name of the most recent commit.</p>
<p>With something like git.git current tree, I get:</p>
<div class="literalblock">
<div class="content">
-<pre><tt>[torvalds@g5 git]$ git-describe parent
+<pre><tt>[torvalds@g5 git]$ git describe parent
v1.0.4-14-g2414721</tt></pre>
</div></div>
<p>i.e. the current head of my "parent" branch is based on v1.0.4,
@@ -411,10 +411,10 @@ at the end.</p>
of commits which would be displayed by "git log v1.0.4..parent".
The hash suffix is "-g" + 7-char abbreviation for the tip commit
of parent (which was <tt>2414721b194453f058079d897d13c4e377f92dc6</tt>).</p>
-<p>Doing a "git-describe" on a tag-name will just show the tag name:</p>
+<p>Doing a <tt>git-describe</tt> on a tag-name will just show the tag name:</p>
<div class="literalblock">
<div class="content">
-<pre><tt>[torvalds@g5 git]$ git-describe v1.0.4
+<pre><tt>[torvalds@g5 git]$ git describe v1.0.4
v1.0.4</tt></pre>
</div></div>
<p>With --all, the command can use branch heads as references, so
@@ -439,19 +439,19 @@ tags/v1.0.0</tt></pre>
</div>
<h2>SEARCH STRATEGY</h2>
<div class="sectionbody">
-<p>For each committish supplied "git describe" will first look for
+<p>For each committish supplied, <tt>git-describe</tt> will first look for
a tag which tags exactly that commit. Annotated tags will always
be preferred over lightweight tags, and tags with newer dates will
always be preferred over tags with older dates. If an exact match
is found, its name will be output and searching will stop.</p>
-<p>If an exact match was not found "git describe" will walk back
+<p>If an exact match was not found, <tt>git-describe</tt> will walk back
through the commit history to locate an ancestor commit which
has been tagged. The ancestor's tag will be output along with an
abbreviation of the input committish's SHA1.</p>
<p>If multiple tags were found during the walk then the tag which
has the fewest commits different from the input committish will be
selected and output. Here fewest commits different is defined as
-the number of commits which would be shown by "git log tag..input"
+the number of commits which would be shown by <tt>git log tag..input</tt>
will be the smallest number of commits possible.</p>
</div>
<h2>Author</h2>
@@ -470,7 +470,7 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 08-Jun-2008 22:46:32 UTC
+Last updated 02-Jul-2008 03:01:40 UTC
</div>
</div>
</body>