From: Sergey Organov Date: Wed, 07 Apr 2021 22:56:08 GMT Subject: [PATCH 9/9] doc/config: document log.diffMerges Message-ID: <20210407225608.14611-10-sorganov@gmail.com> In-Reply-To: <20210407225608.14611-1-sorganov@gmail.com> Added documentation for the new log.diffMerges configuration option. Signed-off-by: Sergey Organov --- Documentation/config/log.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 208d5fdcaa68..456eb07800cb 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -24,6 +24,11 @@ log.excludeDecoration:: the config option can be overridden by the `--decorate-refs` 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`. + log.follow:: If `true`, `git log` will act as if the `--follow` option was used when a single is given. This has the same limitations as `--follow`, -- 2.25.1