mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'so/diff-merges-cleanup'

Browse Source 
Code clean-up.

* so/diff-merges-cleanup:
  diff-merges: clarify log.diffMerges documentation
  diff-merges: cleanup set_diff_merges()
  diff-merges: cleanup func_by_opt()
This commit is contained in:
Junio C Hamano
2022-10-10 10:08:39 -07:00
parent ab26e44d98 c34a6bd291
commit d194e61ea7
2 changed files with 27 additions and 19 deletions
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