summaryrefslogtreecommitdiffstats
path: root/git-diff.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-09-19 06:37:10 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-09-19 06:37:10 +0000
commit4604fe5609a48fc240d1a88a15c642c9883363c7 (patch)
tree846c5b418d438e9580d0a7702be832f1d1d9874c /git-diff.html
parent5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff)
downloadgit-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'git-diff.html')
-rw-r--r--git-diff.html12
1 files changed, 6 insertions, 6 deletions
diff --git a/git-diff.html b/git-diff.html
index 595bb56a4..9ec6c4ea8 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -334,7 +334,7 @@ tree and the index file, or the index file and the working tree.</p></div>
<p>
This form is to view the changes you made relative to
the index (staging area for the next commit). In other
- words, the differences are what you <em>could</em> tell git to
+ words, the differences are what you _could_ tell git to
further add to the index but you still haven't. You can
stage these changes by using <a href="git-add.html">git-add(1)</a>.
</p>
@@ -403,7 +403,7 @@ for the last two forms that use ".." notations, can be any
&lt;tree-ish&gt;.</p></div>
<div class="para"><p>For a more complete list of ways to spell &lt;commit&gt;, see
"SPECIFYING REVISIONS" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.
-However, "diff" is about comparing two <em>endpoints</em>, not ranges,
+However, "diff" is about comparing two _endpoints_, not ranges,
and the range notations ("&lt;commit&gt;..&lt;commit&gt;" and
"&lt;commit&gt;...&lt;commit&gt;") do not mean a range as defined in the
"SPECIFYING RANGES" section in <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div>
@@ -1099,7 +1099,7 @@ It is preceded with a "git diff" header, that looks like
</div></div>
<div class="para"><p>The <tt>a/</tt> and <tt>b/</tt> filenames are the same unless rename/copy is
involved. Especially, even for a creation or a deletion,
-<tt>/dev/null</tt> is <em>not</em> used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
+<tt>/dev/null</tt> is _not_ used in place of <tt>a/</tt> or <tt>b/</tt> filenames.</p></div>
<div class="para"><p>When rename/copy is involved, <tt>file1</tt> and <tt>file2</tt> show the
name of the source file of the rename/copy and the name of
the file that rename/copy produces, respectively.</p></div>
@@ -1253,9 +1253,9 @@ and fileN does not have that line (in other words, the line was
added, from the point of view of that parent).</p></div>
<div class="para"><p>In the above example output, the function signature was changed
from both files (hence two <tt>-</tt> removals from both file1 and
-file2, plus <tt><tt>+</tt> to mean one line that was added does not appear
+file2, plus <tt>++</tt> to mean one line that was added does not appear
in either file1 nor file2). Also two other lines are the same
-from file1 but do not appear in file2 (hence prefixed with <tt> </tt></tt>).</p></div>
+from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p></div>
<div class="para"><p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
merge commit with the merge result (i.e. file1..fileN are the
parents). When shown by <tt>git diff-files -c</tt>, it compares the
@@ -1540,7 +1540,7 @@ Output diff in reverse.
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-03 05:19:56 UTC
+Last updated 2008-09-19 06:32:51 UTC
</div>
</div>
</body>