summaryrefslogtreecommitdiffstats
path: root/git-diff-index.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-index.html
parent48931e26012d8d7ad1a7e1d9701f52be1b77e45a (diff)
downloadgit-htmldocs-92d80370646a0ce43b0c769027492b3c891090aa.tar.gz
Autogenerated HTML docs for v2.9.1-273-g79ed4
Diffstat (limited to 'git-diff-index.html')
-rw-r--r--git-diff-index.html20
1 files changed, 10 insertions, 10 deletions
diff --git a/git-diff-index.html b/git-diff-index.html
index e8ec91554..5b76092da 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -1799,7 +1799,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>
@@ -1809,7 +1809,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>
@@ -1819,7 +1819,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>
@@ -1887,7 +1887,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">
@@ -1930,7 +1930,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
@@ -2056,13 +2056,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>
@@ -2261,7 +2261,7 @@ the pathname, but if that is <code>NUL</code>, the record will show two paths.</
<h2 id="_operating_modes">Operating Modes</h2>
<div class="sectionbody">
<div class="paragraph"><p>You can choose whether you want to trust the index file entirely
-(using the <em>--cached</em> flag) or ask the diff logic to show any files
+(using the <code>--cached</code> flag) or ask the diff logic to show any files
that don&#8217;t match the stat state as being "tentatively changed". Both
of these operations are very useful indeed.</p></div>
</div>
@@ -2269,7 +2269,7 @@ of these operations are very useful indeed.</p></div>
<div class="sect1">
<h2 id="_cached_mode">Cached Mode</h2>
<div class="sectionbody">
-<div class="paragraph"><p>If <em>--cached</em> is specified, it allows you to ask:</p></div>
+<div class="paragraph"><p>If <code>--cached</code> is specified, it allows you to ask:</p></div>
<div class="literalblock">
<div class="content">
<pre><code>show me the differences between HEAD and the current index
@@ -2367,7 +2367,7 @@ always have the special all-zero sha1.</td>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2016-07-13 14:58:50 PDT
</div>
</div>
</body>