diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-20 06:30:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-20 06:30:11 +0000 |
| commit | 54bf1e2728abed073b4c0bd79830af6cdbcc67fe (patch) | |
| tree | 4f813eacc91b38b7503eb07e830984d3a8b187ce /git-diff.html | |
| parent | 6a3c82713a6d40b17cafd5a3eb312fe7b25d277e (diff) | |
| download | git-htmldocs-54bf1e2728abed073b4c0bd79830af6cdbcc67fe.tar.gz | |
Autogenerated HTML docs for v1.6.1-rc3-51-g5832d
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-diff.html b/git-diff.html index 231dfd0f3..8474fd83b 100644 --- a/git-diff.html +++ b/git-diff.html @@ -1079,7 +1079,7 @@ X: "unknown" change type (most probably a bug, please report it) </p>
</li>
</ul></div>
-<div class="para"><p>Status letters C and M are always followed by a score (denoting the
+<div class="para"><p>Status letters C and R are always followed by a score (denoting the
percentage of similarity between the source and target of the move or
copy), and are the only ones to be so.</p></div>
<div class="para"><p><sha1> is shown as all 0's if a file is new on the filesystem
@@ -1305,14 +1305,14 @@ fileN is prepended to the output line to note how X's line is different from it.</p></div>
<div class="para"><p>A <tt>-</tt> character in the column N means that the line appears in
fileN but it does not appear in the result. A <tt>+</tt> character
-in the column N means that the line appears in the last file,
+in the column N means that the line appears in the result,
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> 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>).</p></div>
+in either file1 nor file2). Also eight other lines are the same
+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
@@ -1597,7 +1597,7 @@ Output diff in reverse. </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-12-10 08:33:13 UTC
+Last updated 2008-12-20 06:29:39 UTC
</div>
</div>
</body>
|