diff-merges: clarify log.diffMerges documentation
Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Sep 14, 2022 at 22:31 UTC
c34a6bd291d5bfe2bec22d1c5441f8712306a527
1 file changed
+3
-3
Documentation/config/log.txt
+3
-3
@@ -34,9 +34,9 @@ log.excludeDecoration::
34
option.
35
36
log.diffMerges::
37
- Set default diff format to be used for merge commits. See
38
- `--diff-merges` in linkgit:git-log[1] for details.
39
- Defaults to `separate`.
37
+ Set diff format to be used when `--diff-merges=on` is
38
+ specified, see `--diff-merges` in linkgit:git-log[1] for
39
+ details. Defaults to `separate`.
40
41
log.follow::
42
If `true`, `git log` will act as if the `--follow` option was used when