diff-format.adoc: 'git diff-files' prints two lines for unmerged files
Since 10637b84d9 (diff-files: -1/-2/-3 to diff against unmerged stage., 2005-11-29), for unmerged entries 'git diff-files' print both an "unmerged" line ('U'), as well as an "in-place edit" line ('M') comparing stage 2 (by default) with the working tree. The "Raw output format" documentation however mentions that all commands print a single line per changed file. Adjust diff-format.adoc to also mention this special case, for completeness. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philippe Blain committed
May 15, 2026 at 15:48 UTC
4cd5d8a3c84a7d6f66f9bed67c1b974043b8a639
1 file changed
+3
-1
Documentation/diff-format.adoc
+3
-1
@@ -19,7 +19,9 @@ compared differs:
19
`git-diff-files [<pattern>...]`::
20
compares the index and the files on the filesystem.
21
22
-All the commands print one output line per changed file.
22
+All the commands print one output line per changed file,
23
+except `git diff-files` in the case of an unmerged file, which prints
24
+both an "unmerged" and an "in-place edit" line.
25
26
An output line is formatted this way:
27