diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-03-25 00:38:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-03-25 00:38:53 +0000 |
| commit | 3166736468c0b21727d059d09468111c5a3163c4 (patch) | |
| tree | f94473e9050b0b159edbdec0a0619f4d8d57c11d /git-diff-index.html | |
| parent | 9ccf664de57a05c6417f1fe46f6c6b55322f218c (diff) | |
| download | git-htmldocs-3166736468c0b21727d059d09468111c5a3163c4.tar.gz | |
Autogenerated HTML docs for v1.7.0.3-291-g5e4f
Diffstat (limited to 'git-diff-index.html')
| -rw-r--r-- | git-diff-index.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-diff-index.html b/git-diff-index.html index da5acec2e..883ed3ad9 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -1165,7 +1165,8 @@ file made it into the new one.</p></div> <div class="sectionbody">
<div class="para"><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.
+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="listingblock">
<div class="content">
@@ -1508,7 +1509,7 @@ always have the special all-zero sha1.</td> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-03-03 05:12:39 UTC
+Last updated 2010-03-25 00:38:22 UTC
</div>
</div>
</body>
|