From: Sergey Organov Date: Mon, 21 Dec 2020 15:19:57 +0000 (+0300) Subject: doc/diff-generate-patch: mention new --diff-merges option X-Git-Tag: v2.31.0-rc0~84^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8efd2efc32c41c7dcc2bf86a11fa89377f1c8d94;p=thirdparty%2Fgit.git doc/diff-generate-patch: mention new --diff-merges option Mention --diff-merges instead of -m in a note to merge formats to aid discoverability, as -m is now described among --diff-merges options anyway. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index b10ff4caa6..2db8eacc3e 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -81,9 +81,9 @@ Combined diff format Any diff-generating command can take the `-c` or `--cc` option to produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or -linkgit:git-show[1]. Note also that you can give the `-m` option to any -of these commands to force generation of diffs with individual parents -of a merge. +linkgit:git-show[1]. Note also that you can give suitable +`--diff-merges` option to any of these commands to force generation of +diffs in specific format. A "combined diff" format looks like this: