Skip to content

Commit c34a6bd

Browse files
sorganovgitster
authored andcommitted
diff-merges: clarify log.diffMerges documentation
Signed-off-by: Sergey Organov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 563005e commit c34a6bd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/config/log.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ log.excludeDecoration::
3434
option.
3535

3636
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`.
4040

4141
log.follow::
4242
If `true`, `git log` will act as if the `--follow` option was used when

0 commit comments

Comments
 (0)