From cf6cac20059123d6ec3f867bb3692df62db52cf9 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sun, 8 Oct 2023 06:45:03 +0000 Subject: documentation: wording improvements Diff best viewed with --color-diff. Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/diff-generate-patch.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/diff-generate-patch.txt') diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 546adf79e5..55df903abd 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -146,7 +146,7 @@ information about detected contents movement (renames and copying detection) are designed to work with diff of two and are not used by combined diff format. -3. It is followed by two-line from-file/to-file header +3. It is followed by a two-line from-file/to-file header: --- a/file +++ b/file @@ -157,7 +157,7 @@ files. + However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, -where N is the number of parents in the merge commit +where N is the number of parents in the merge commit: --- a/file --- a/file -- cgit v1.3