diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-02-05 17:37:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 17:37:47 -0800 |
| commit | 8c860d674a0fd61e7ec06e9025c19101cc058eff (patch) | |
| tree | 2f79a6ed738fc24aee4477f9cc1e2e9b540a10ab /git-diff-files.html | |
| parent | 68d44a202822cda89f04e8e831531734207c6cd4 (diff) | |
| download | git-htmldocs-8c860d674a0fd61e7ec06e9025c19101cc058eff.tar.gz | |
Autogenerated HTML docs for v2.30.0-452-gfb7fa
Diffstat (limited to 'git-diff-files.html')
| -rw-r--r-- | git-diff-files.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-diff-files.html b/git-diff-files.html index 51c8c99b4..49b10af0a 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -2411,9 +2411,9 @@ rename to a</code></pre> <div class="paragraph"><p>Any diff-generating command can take the <code>-c</code> or <code>--cc</code> option to
produce a <em>combined diff</em> when showing a merge. This is the default
format when showing merges with <a href="git-diff.html">git-diff(1)</a> or
-<a href="git-show.html">git-show(1)</a>. Note also that you can give the <code>-m</code> option to any
-of these commands to force generation of diffs with individual parents
-of a merge.</p></div>
+<a href="git-show.html">git-show(1)</a>. Note also that you can give suitable
+<code>--diff-merges</code> option to any of these commands to force generation of
+diffs in specific format.</p></div>
<div class="paragraph"><p>A "combined diff" format looks like this:</p></div>
<div class="listingblock">
<div class="content">
|