diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-03-09 07:20:43 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-03-09 07:20:43 +0000 |
| commit | c5be4cc1f482f43e73d5d1289ca5e4ab3cc0b9fd (patch) | |
| tree | a9026547e907e98bf2a7fc3e82937f3cab6d0c1a /git-diff-files.html | |
| parent | 6b8a079027a0d183242b35eae8b0d407b9b319b2 (diff) | |
| download | git-htmldocs-c5be4cc1f482f43e73d5d1289ca5e4ab3cc0b9fd.tar.gz | |
Autogenerated HTML docs for v1.7.4.1-208-gf7c6c
Diffstat (limited to 'git-diff-files.html')
| -rw-r--r-- | git-diff-files.html | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/git-diff-files.html b/git-diff-files.html index 6b5ce9e9b..5ebb919cf 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -1413,11 +1413,13 @@ rename to a</tt></pre> </div>
<h2 id="_combined_diff_format">combined diff format</h2>
<div class="sectionbody">
-<div class="paragraph"><p>"git-diff-tree", "git-diff-files" and "git-diff" can take <em>-c</em> or
-<em>--cc</em> option to produce <em>combined diff</em>. For showing a merge commit
-with "git log -p", this is the default format; you can force showing
-full diff with the <em>-m</em> option.
-A <em>combined diff</em> format looks like this:</p></div>
+<div class="paragraph"><p>Any diff-generating command can take the ‘-c` or <tt>--cc</tt> 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 `-m’ option to any
+of these commands to force generation of diffs with individual parents
+of a merge.</p></div>
+<div class="paragraph"><p>A <em>combined diff</em> format looks like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>diff --combined describe.c
|