diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-27 15:24:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-27 15:24:11 -0700 |
| commit | 1b97c136cc84cb8e65c4c45a717e6cb816841889 (patch) | |
| tree | c0fc2fa2ed8703743cfa5892ca0ee1eebc11c974 /Documentation/config | |
| parent | feba8be3f084b9e9ee90c2772756c9baa19df8d7 (diff) | |
| parent | c34a6bd291d5bfe2bec22d1c5441f8712306a527 (diff) | |
| download | git-1b97c136cc84cb8e65c4c45a717e6cb816841889.tar.gz | |
Merge branch 'so/diff-merges-cleanup' into maint-2.38
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()
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/log.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index bc63bc3939..5f96cf87fb 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -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 |