summaryrefslogtreecommitdiffstats
path: root/git-diff-files.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-diff-files.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-diff-files.html')
-rw-r--r--git-diff-files.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/git-diff-files.html b/git-diff-files.html
index 64ab0b454..3d27b0be1 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -1815,7 +1815,7 @@ status, followed by optional "score" number.
</li>
<li>
<p>
-a tab or a NUL when <em>-z</em> option is used.
+a tab or a NUL when <code>-z</code> option is used.
</p>
</li>
<li>
@@ -1825,7 +1825,7 @@ path for "src"
</li>
<li>
<p>
-a tab or a NUL when <em>-z</em> option is used; only exists for C or R.
+a tab or a NUL when <code>-z</code> option is used; only exists for C or R.
</p>
</li>
<li>
@@ -1835,7 +1835,7 @@ path for "dst"; only exists for C or R.
</li>
<li>
<p>
-an LF or a NUL when <em>-z</em> option is used, to terminate the record.
+an LF or a NUL when <code>-z</code> option is used, to terminate the record.
</p>
</li>
</ol></div>
@@ -1903,7 +1903,7 @@ respectively.</p></div>
<h2 id="_diff_format_for_merges">diff format for merges</h2>
<div class="sectionbody">
<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff --raw"
-can take <em>-c</em> or <em>--cc</em> option
+can take <code>-c</code> or <code>--cc</code> option
to generate diff output also for merge commits. The output differs
from the format described above in the following way:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -1946,7 +1946,7 @@ all parents.</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
@@ -2072,13 +2072,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>