summaryrefslogtreecommitdiffstats
path: root/git-log.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-13 15:00:05 -0700
commit92d80370646a0ce43b0c769027492b3c891090aa (patch)
treecee7315334fee3145cb4badcc7a400e3e763fbac /git-log.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-log.html')
-rw-r--r--git-log.html8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-log.html b/git-log.html
index 3227d55ab..00e1b6b8f 100644
--- a/git-log.html
+++ b/git-log.html
@@ -1264,7 +1264,7 @@ explicitly.</p></div>
<dd>
<p>
In addition to the <em>&lt;commit&gt;</em> listed on the command
- line, read them from the standard input. If a <em>--</em> separator is
+ line, read them from the standard input. If a <code>--</code> separator is
seen, stop reading commits and start reading paths to limit the
result.
</p>
@@ -3609,7 +3609,7 @@ information.</p></div>
<h2 id="_generating_patches_with_p">Generating patches with -p</h2>
<div class="sectionbody">
<div class="paragraph"><p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run
-with a <em>-p</em> option, "git diff" without the <em>--raw</em> option, or
+with a <code>-p</code> option, "git diff" without the <code>--raw</code> option, or
"git log" with the "-p" option, they
do not produce the output described above; instead they produce a
patch file. You can customize the creation of such patches via the
@@ -3735,13 +3735,13 @@ index fabadb8,cc95eb0..4866510
<li>
<p>
It is preceded with a "git diff" header, that looks like
- this (when <em>-c</em> option is used):
+ this (when <code>-c</code> option is used):
</p>
<div class="literalblock">
<div class="content">
<pre><code>diff --combined file</code></pre>
</div></div>
-<div class="paragraph"><p>or like this (when <em>--cc</em> option is used):</p></div>
+<div class="paragraph"><p>or like this (when <code>--cc</code> option is used):</p></div>
<div class="literalblock">
<div class="content">
<pre><code>diff --cc file</code></pre>