From: Sergey Organov Date: Wed, 14 Sep 2022 19:31:02 GMT Subject: [PATCH 3/3] diff-merges: clarify log.diffMerges documentation Message-ID: <20220914193102.5275-4-sorganov@gmail.com> In-Reply-To: <20220914193102.5275-1-sorganov@gmail.com> Signed-off-by: Sergey Organov --- Documentation/config/log.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 5250ba45fb4e..cbe34d759221 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -30,9 +30,9 @@ log.excludeDecoration:: option. log.diffMerges:: - Set default diff format to be used for merge commits. See - `--diff-merges` in linkgit:git-log[1] for details. - Defaults to `separate`. + Set diff format to be used when `--diff-merges=on` is + specified, see `--diff-merges` in linkgit:git-log[1] for + details. Defaults to `separate`. log.follow:: If `true`, `git log` will act as if the `--follow` option was used when -- 2.25.1