diff options
| author | Philippe Blain <levraiphilippeblain@gmail.com> | 2026-05-15 15:48:11 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-05-16 22:21:37 +0900 |
| commit | 6d09e798bcfba92ef071abb27ad807985681122c (patch) | |
| tree | 8e66681abbc9d9a3fc13caa9ba792d6b68c77f50 /t/t4013/diff.diff_initial..side | |
| parent | 4cd5d8a3c84a7d6f66f9bed67c1b974043b8a639 (diff) | |
diff-format.adoc: mode and hash are 0* for unmerged paths from index only
In the "Raw output format" section, we mention that the 'mode' and
'sha1' for "src" and "dst" are 0* if "(creation|deletion) or unmerged".
For unmerged entries, 'mode' and 'sha1' are in fact 0* only when we are
looking at the index, i.e. on the left side for 'git diff-files' and on
the right side for 'git diff-index --cached'. Be more precise by
mentioning this, and while at it uniformize the wording of the "work
tree out of sync with the index" case.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions
