summaryrefslogtreecommitdiffstats
path: root/git-describe.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-17 14:34:00 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-17 14:34:00 -0700
commite6f28d0b6c239f15760194c8b12afdaa1a7bdd34 (patch)
treeb782d1e78feb1a9f17131581d754b0e29abaa0b8 /git-describe.html
parent0e0e0d2656a57fd3628bb6dbdaf0096684ed24a9 (diff)
downloadgit-htmldocs-e6f28d0b6c239f15760194c8b12afdaa1a7bdd34.tar.gz
Autogenerated HTML docs for v1.8.4-357-g8d83
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 ca3f43605..5393a3eb7 100644
--- a/git-describe.html
+++ b/git-describe.html
@@ -746,7 +746,7 @@ git-describe(1) Manual Page
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] &lt;committish&gt;&#8230;
+<pre class="content"><em>git describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] &lt;commit-ish&gt;&#8230;
<em>git describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] --dirty[=&lt;mark&gt;]</pre>
<div class="attribution">
</div></div>
@@ -770,11 +770,11 @@ see the -a and -s options to <a href="git-tag.html">git-tag(1)</a>.</p></div>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-&lt;committish&gt;&#8230;
+&lt;commit-ish&gt;&#8230;
</dt>
<dd>
<p>
- Committish object names to describe.
+ Commit-ish object names to describe.
</p>
</dd>
<dt class="hdlist1">
@@ -834,7 +834,7 @@ see the -a and -s options to <a href="git-tag.html">git-tag(1)</a>.</p></div>
<dd>
<p>
Instead of considering only the 10 most recent tags as
- candidates to describe the input committish consider
+ candidates to describe the input commit-ish consider
up to &lt;n&gt; candidates. Increasing &lt;n&gt; above 10 will take
slightly longer but may produce a more accurate result.
An &lt;n&gt; of 0 will cause only exact matches to be output.
@@ -960,7 +960,7 @@ be sufficient to disambiguate these commits.</p></div>
<div class="sect1">
<h2 id="_search_strategy">SEARCH STRATEGY</h2>
<div class="sectionbody">
-<div class="paragraph"><p>For each committish supplied, <em>git describe</em> will first look for
+<div class="paragraph"><p>For each commit-ish supplied, <em>git describe</em> 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
@@ -968,11 +968,11 @@ is found, its name will be output and searching will stop.</p></div>
<div class="paragraph"><p>If an exact match was not found, <em>git describe</em> will walk back
through the commit history to locate an ancestor commit which
has been tagged. The ancestor&#8217;s tag will be output along with an
-abbreviation of the input committish&#8217;s SHA-1. If <em>--first-parent</em> was
+abbreviation of the input commit-ish&#8217;s SHA-1. If <em>--first-parent</em> was
specified then the walk will only consider the first parent of each
commit.</p></div>
<div class="paragraph"><p>If multiple tags were found during the walk then the tag which
-has the fewest commits different from the input committish will be
+has the fewest commits different from the input commit-ish will be
selected and output. Here fewest commits different is defined as
the number of commits which would be shown by <code>git log tag..input</code>
will be the smallest number of commits possible.</p></div>
@@ -988,7 +988,7 @@ will be the smallest number of commits possible.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-17 14:33:14 PDT
</div>
</div>
</body>