diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:37:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:37:10 +0000 |
| commit | 4604fe5609a48fc240d1a88a15c642c9883363c7 (patch) | |
| tree | 846c5b418d438e9580d0a7702be832f1d1d9874c /git-diff-index.html | |
| parent | 5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (diff) | |
| download | git-htmldocs-4604fe5609a48fc240d1a88a15c642c9883363c7.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'git-diff-index.html')
| -rw-r--r-- | git-diff-index.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-diff-index.html b/git-diff-index.html index fa3ddb453..1713b5f54 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1038,7 +1038,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>
@@ -1192,9 +1192,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
@@ -1425,7 +1425,7 @@ always have the special all-zero sha1.</td> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-03 05:19:54 UTC
+Last updated 2008-09-19 06:32:50 UTC
</div>
</div>
</body>
|