diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-01-28 13:17:19 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-01-28 22:22:03 -0800 |
commit | ac1c2d9a2129b1ccb2e570a2cdaf8522c58f9539 (patch) | |
tree | b3b6afbe0a77586c7be1e2c0bc9c433740b8222a /git-am.sh | |
parent | Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 (diff) | |
download | tgif-ac1c2d9a2129b1ccb2e570a2cdaf8522c58f9539.tar.xz |
diff-format doc: a score can follow M for rewrite
b6d8f309 (diff-raw format update take #2., 2005-05-23) started
documenting the diff format, and it said
...
(8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
(9) status, followed by similarlity index number only for C and R.
(10) a tab or a NUL when '-z' option is used.
...
because C and R _were_ the only ones that came with a number back
then. This was corrected by ddafa7e9 (diff-helper: Fix R/C score
parsing under -z flag., 2005-05-29) and we started saying "score"
instead of "similarlity index" (because we can have other kind of
score there), and stopped saying "only for C and R" (because Git is
an ever evolving system). Later f345b0a0 (Add -B flag to diff-*
brothers., 2005-05-30) introduced a new concept, "dissimilarity"
score; it did not have to fix any documentation.
The current text that says only C and R can have scores came
independently from a5a323f3 (Add reference for status letters in
documentation., 2008-11-02) and it was wrong from the day one.
Noticed-by: Mike Hommey
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions