X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-files.html;h=1f7197aa9952739fe2c06d86d06c9cad455fe751;hb=04a32861b324bccf6dc0602f414825cab4eeca78;hp=6eea3ada88aa53a917716f0c7c91e806e24cf769;hpb=235a91e6b0d1d18a2517cf7e0a18278a6912bdb0;p=git.git

diff --git a/git-diff-files.html b/git-diff-files.html
index 6eea3ada..1f7197aa 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 7.0.1" />
+<meta name="generator" content="AsciiDoc 7.0.2" />
 <style type="text/css">
 /* Debug borders */
 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -272,7 +272,7 @@ git-diff-files(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-diff-files</em> [-q] [&lt;common diff options&gt;] [&lt;path&gt;&#8230;]</p>
+<p><em>git-diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc] [&lt;common diff options&gt;] [&lt;path&gt;&#8230;]</p>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -372,6 +372,22 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>
 </dd>
 <dt>
+--diff-filter=[ACDMRTUXB*]
+</dt>
+<dd>
+<p>
+        Select only files that are Added (<tt>A</tt>), Copied (<tt>C</tt>),
+        Deleted (<tt>D</tt>), Modified (<tt>M</tt>), Renamed (<tt>R</tt>), have their
+        type (mode) changed (<tt>T</tt>), are Unmerged (<tt>U</tt>), are
+        Unknown (<tt>X</tt>), or have had their pairing Broken (<tt>B</tt>).
+        Any combination of the filter characters may be used.
+        When <tt>*</tt> (All-or-none) is added to the combination, all
+        paths are selected if there is any file that matches
+        other criteria in the comparison; if there is no file
+        that matches other criteria, nothing is selected.
+</p>
+</dd>
+<dt>
 --find-copies-harder
 </dt>
 <dd>
@@ -450,6 +466,17 @@ cleanly resolved paths.  The option -0 can be given to
 omit diff output for unmerged entries and just show "Unmerged".</p>
 </dd>
 <dt>
+-c,--cc
+</dt>
+<dd>
+<p>
+        This compares stage 2 (our branch), stage 3 (their
+        branch) and the working tree file and outputs a combined
+        diff, similar to the way <em>diff-tree</em> shows a merge
+        commit with these flags.
+</p>
+</dd>
+<dt>
 -q
 </dt>
 <dd>
@@ -722,6 +749,48 @@ TAB, LF, and backslash characters in pathnames are
 </li>
 </ol>
 </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>
+<div class="listingblock">
+<div class="content">
+<pre><tt>diff --combined describe.c
+@@@ +98,7 @@@
+   return (a_date &gt; b_date) ? -1 : (a_date == b_date) ? 0 : 1;
+  }
+
+- static void describe(char *arg)
+ -static void describe(struct commit *cmit, int last_one)
+++static void describe(char *arg, int last_one)
+  {
+ +     unsigned char sha1[20];
+ +     struct commit *cmit;</tt></pre>
+</div></div>
+<p>Unlike the traditional <em>unified</em> diff format, which shows two
+files A and B with a single column that has <tt>-</tt> (minus &#8212;
+appears in A but removed in B), <tt>+</tt> (plus &#8212; missing in A but
+added to B), or <tt> </tt> (space &#8212; unchanged) prefix, this format
+compares two or more files file1, file2,&#8230; with one file X, and
+shows how X differs from each of fileN.  One column for each of
+fileN is prepended to the output line to note how X's line is
+different from it.</p>
+<p>A <tt>-</tt> character in the column N means that the line appears in
+fileN but it does not appear in the last file.  A <tt>+</tt> character
+in the column N means that the line appears in the last file,
+and fileN does not have that line.</p>
+<p>In the above example output, the function signature was changed
+from both files (hence two <tt>-</tt> removals from both file1 and
+file2, plus <tt>++</tt> to mean one line that was added does not appear
+in either file1 nor file2).  Also two other lines are the same
+from file1 but do not appear in file2 (hence prefixed with <tt> +</tt>).</p>
+<p>When shown by <tt>git diff-tree -c</tt>, it compares the parents of a
+merge commit with the merge result (i.e. file1..fileN are the
+parents).  When shown by <tt>git diff-files -c</tt>, it compares the
+two unresolved merge parents with the working tree file
+(i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka
+"their version").</p>
+</div>
 <h2>Author</h2>
 <div class="sectionbody">
 <p>Written by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
@@ -736,7 +805,7 @@ TAB, LF, and backslash characters in pathnames are
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 06-Jan-2006 17:12:18 PDT
+Last updated 10-Feb-2006 05:51:45 UTC
 </div>
 </div>
 </body>
