From: Philippe Blain Date: Fri, 15 May 2026 15:48:10 +0000 (+0000) Subject: diff-format.adoc: 'git diff-files' prints two lines for unmerged files X-Git-Tag: v2.55.0-rc0~54^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cd5d8a3c84a7d6f66f9bed67c1b974043b8a639;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/diff-format.adoc b/Documentation/diff-format.adoc index 7f18c64f1e..43d91ef868 100644 --- a/Documentation/diff-format.adoc +++ b/Documentation/diff-format.adoc @@ -19,7 +19,9 @@ compared differs: `git-diff-files [...]`:: compares the index and the files on the filesystem. -All the commands print one output line per changed file. +All the commands print one output line per changed file, +except `git diff-files` in the case of an unmerged file, which prints +both an "unmerged" and an "in-place edit" line. An output line is formatted this way: