development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

diff-merges: clarify log.diffMerges documentation

Browse source 
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sergey Organov 2022-09-14 22:31:02 +03:00 committed by Junio C Hamano
parent 563005ecbf
commit c34a6bd291
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/config/log.txt
View file

@ -34,9 +34,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