From be3820c60cc82e0ded1d3f3dcc19fbd59ce56aa2 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 9 Oct 2023 19:05:33 +0300 Subject: diff-merges: improve --diff-merges documentation * Put descriptions of convenience shortcuts first, so they are the first things reader observes rather than lengthy detailed stuff. * Get rid of very long line containing all the --diff-merges formats by replacing them with , and putting each supported format on its own line. Signed-off-by: Sergey Organov Signed-off-by: Junio C Hamano --- Documentation/git-log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-log.txt') diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 2a66cf8880..9b7ec96e76 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -124,7 +124,7 @@ Note that unless one of `--diff-merges` variants (including short will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is -the default format. +the default format for merge commits. :git-log: 1 :diff-merges-default: `off` -- cgit v1.3