Autogenerated HTML docs for v2.4.1-314-g9532e

1 files changed, 3 insertions, 5 deletions

diff --git a/git-show.html b/git-show.html
index 17bd82992..82386abdd 100644
--- a/git-show.html
+++ b/git-show.html
@@ -1450,7 +1450,6 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
 <dd>

 <p>

         Generate patch (see section on generating patches).

-        

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1484,7 +1483,6 @@ $ git log -2 --pretty=%h 4da45bef</code></pre>
 <dd>

 <p>

         Generate the raw format.

-        

 </p>

 </dd>

 <dt class="hdlist1">

@@ -2378,10 +2376,10 @@ rename to a</code></pre>
 <div class="sect1">

 <h2 id="_combined_diff_format">combined diff format</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Any diff-generating command can take the &#8216;-c` or <code>--cc</code> option to

+<div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to

 produce a <em>combined diff</em> when showing a merge. This is the default

 format when showing merges with <a href="git-diff.html">git-diff(1)</a> or

-<a href="git-show.html">git-show(1)</a>. Note also that you can give the `-m&#8217; option to any

+<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any

 of these commands to force generation of diffs with individual parents

 of a merge.</p></div>

 <div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>

@@ -2642,7 +2640,7 @@ reversible operation.</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 2015-05-22 13:47:07 PDT

 </div>

 </div>

 </body>