Autogenerated HTML docs for v1.8.3-182-gb2edae

1 files changed, 14 insertions, 2 deletions

diff --git a/git-describe.html b/git-describe.html
index a4c2aa64a..2671f47b1 100644
--- a/git-describe.html
+++ b/git-describe.html
@@ -891,6 +891,16 @@ see the -a and -s options to <a href="git-tag.html">git-tag(1)</a>.</p></div>
         Show uniquely abbreviated commit object as fallback.

 </p>

 </dd>

+<dt class="hdlist1">

+--first-parent

+</dt>

+<dd>

+<p>

+        Follow only the first parent commit upon seeing a merge commit.

+        This is useful when you wish to not match tags on branches merged

+        in the history of the target commit.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -958,7 +968,9 @@ 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.</p></div>

+abbreviation of the input committish&#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

 selected and output.  Here fewest commits different is defined as

@@ -976,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-04-21 19:25:38 PDT

+Last updated 2013-06-02 16:46:06 PDT

 </div>

 </div>

 </body>