summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-22 13:48:55 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-22 13:48:55 -0700
commit1dbca52d492eab38500f435fc9af5f463d3e9c95 (patch)
tree91d8a505b64826863ccc4f99576a2a8b0f6c07fe /git-diff.html
parente1b28594a7acfaa493ca0cf32e7e970dc549527a (diff)
downloadgit-htmldocs-1dbca52d492eab38500f435fc9af5f463d3e9c95.tar.gz
Autogenerated HTML docs for v2.4.1-314-g9532e
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/git-diff.html b/git-diff.html
index c7f550838..a8d34308c 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -886,7 +886,7 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
<dd>
<p>
Generate patch (see section on generating patches).
- This is the default.
+ This is the default.
</p>
</dd>
<dt class="hdlist1">
@@ -920,7 +920,6 @@ and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
<dd>
<p>
Generate the raw format.
-
</p>
</dd>
<dt class="hdlist1">
@@ -2079,10 +2078,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>