diff options
Diffstat (limited to 'git-log.html')
| -rw-r--r-- | git-log.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-log.html b/git-log.html index a1f3e1e16..843838c94 100644 --- a/git-log.html +++ b/git-log.html @@ -5405,9 +5405,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">
|