diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-17 10:15:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-17 10:15:26 -0800 |
| commit | ec8618a7f85fe3fa6da8afda90658f36fc9a1b21 (patch) | |
| tree | c8ada89e51e7af1449ecaf8b93e01f9f289c47ca | |
| parent | b93b5b21b5358c1e5afc7d7d6e8ebf0ba345d98b (diff) | |
| parent | ac1c2d9a2129b1ccb2e570a2cdaf8522c58f9539 (diff) | |
| download | git-ec8618a7f85fe3fa6da8afda90658f36fc9a1b21.tar.gz git-ec8618a7f85fe3fa6da8afda90658f36fc9a1b21.tar.xz | |
Merge branch 'jc/diff-format-doc'
The documentation incorrectly said that C(opy) and R(ename) are the
only ones that can be followed by the score number in the output in
the --raw format.
* jc/diff-format-doc:
diff-format doc: a score can follow M for rewrite
| -rw-r--r-- | Documentation/diff-format.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 15c7e794f..85b08909c 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -66,7 +66,8 @@ be committed) 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. +copy). Status letter M may be followed by a score (denoting the +percentage of dissimilarity) for file rewrites. <sha1> is shown as all 0's if a file is new on the filesystem and it is out of sync with the index. |