Autogenerated HTML docs for v1.5.3.5-529-ge3d6d

1 files changed, 11 insertions, 10 deletions

diff --git a/git-diff-files.html b/git-diff-files.html
index 41c6bc487..f1fcd2ed6 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -739,8 +739,8 @@ omit diff output for unmerged entries and just show "Unmerged".</p>
 </div>

 <h2>Output format</h2>

 <div class="sectionbody">

-<p>The output format from "git-diff-index", "git-diff-tree" and

-"git-diff-files" are very similar.</p>

+<p>The output format from "git-diff-index", "git-diff-tree",

+"git-diff-files" and "git diff --raw" are very similar.</p>

 <p>These commands all compare two sets of things; what is

 compared differs:</p>

 <dl>

@@ -878,7 +878,8 @@ respectively.</p>
 </div>

 <h2>diff format for merges</h2>

 <div class="sectionbody">

-<p>"git-diff-tree" and "git-diff-files" can take <em>-c</em> or <em>--cc</em> option

+<p>"git-diff-tree", "git-diff-files" and "git-diff --raw"

+can take <em>-c</em> or <em>--cc</em> option

 to generate diff output also for merge commits.  The output differs

 from the format described above in the following way:</p>

 <ol>

@@ -919,10 +920,10 @@ all parents.</p>
 <h2>Generating patches with -p</h2>

 <div class="sectionbody">

 <p>When "git-diff-index", "git-diff-tree", or "git-diff-files" are run

-with a <em>-p</em> option, they do not produce the output described above;

-instead they produce a patch file.  You can customize the creation

-of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS

-environment variables.</p>

+with a <em>-p</em> option, or "git diff" without the <em>--raw</em> option, they

+do not produce the output described above; instead they produce a

+patch file.  You can customize the creation of such patches via the

+GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS environment variables.</p>

 <p>What the -p option produces is slightly different from the traditional

 diff format.</p>

 <ol>

@@ -979,8 +980,8 @@ file made it into the new one.</p>
 </div>

 <h2>combined diff format</h2>

 <div class="sectionbody">

-<p>git-diff-tree and git-diff-files can take <em>-c</em> or <em>--cc</em> option

-to produce <em>combined diff</em>, which looks like this:</p>

+<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>, which looks like this:</p>

 <div class="listingblock">

 <div class="content">

 <pre><tt>diff --combined describe.c

@@ -1113,7 +1114,7 @@ two unresolved merge parents with the working tree file
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 03-Oct-2007 12:03:44 UTC

+Last updated 03-Nov-2007 02:45:08 UTC

 </div>

 </div>

 </body>