diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-10 14:42:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-10 14:42:31 -0700 |
| commit | 53cd02b2a9159e3a20482f074bfc1a82e2e52ee1 (patch) | |
| tree | cac5c5ea7340a723d32bd0a8c562022bd94258fd /git-config.html | |
| parent | 02fd564899717e387af25eeaa48400110c084ec1 (diff) | |
| download | git-htmldocs-53cd02b2a9159e3a20482f074bfc1a82e2e52ee1.tar.gz | |
Autogenerated HTML docs for v2.38.0-68-ge8570
Diffstat (limited to 'git-config.html')
| -rw-r--r-- | git-config.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-config.html b/git-config.html index 02c22fd21..c9f5c855f 100644 --- a/git-config.html +++ b/git-config.html @@ -7659,9 +7659,9 @@ log.diffMerges </dt>
<dd>
<p>
- Set default diff format to be used for merge commits. See
- <code>--diff-merges</code> in <a href="git-log.html">git-log(1)</a> for details.
- Defaults to <code>separate</code>.
+ Set diff format to be used when <code>--diff-merges=on</code> is
+ specified, see <code>--diff-merges</code> in <a href="git-log.html">git-log(1)</a> for
+ details. Defaults to <code>separate</code>.
</p>
</dd>
<dt class="hdlist1">
|