X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-tree.html;h=bab73a827f5aaf9403876804828fdf8003bbc017;hb=6f8a790ac13610bca8a8932a414d3849303d1ff5;hp=27362c24fb721d8f365e38c380936a35d09795b1;hpb=1a4e841b439ba014b365999c3a6b9e2be3740bd8;p=git.git

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 27362c24..bab73a82 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.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,10 @@ git-diff-tree(1) Manual Page
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<p><em>git-diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] [--root] [&lt;common diff options&gt;] &lt;tree-ish&gt; [&lt;tree-ish&gt;] [&lt;path&gt;&#8230;]</p>
+<div class="verseblock">
+<div class="content"><em>git-diff-tree</em> [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
+              [-t] [-r] [-c | --cc] [--root] [&lt;common diff options&gt;]
+              &lt;tree-ish&gt; [&lt;tree-ish&gt;] [&lt;path&gt;&#8230;]</div></div>
 </div>
 <h2>DESCRIPTION</h2>
 <div class="sectionbody">
@@ -301,6 +304,39 @@ git-diff-tree(1) Manual Page
 </p>
 </dd>
 <dt>
+--patch-with-raw
+</dt>
+<dd>
+<p>
+        Generate patch but keep also the default raw diff output.
+</p>
+</dd>
+<dt>
+--stat
+</dt>
+<dd>
+<p>
+        Generate a diffstat instead of a patch.
+</p>
+</dd>
+<dt>
+--summary
+</dt>
+<dd>
+<p>
+        Output a condensed summary of extended header information
+        such as creations, renames and mode changes.
+</p>
+</dd>
+<dt>
+--patch-with-stat
+</dt>
+<dd>
+<p>
+        Generate patch and prepend its diffstat.
+</p>
+</dd>
+<dt>
 -z
 </dt>
 <dd>
@@ -341,7 +377,7 @@ git-diff-tree(1) Manual Page
 <p>
         Instead of showing the full 40-byte hexadecimal object
         name in diff-raw format output and diff-tree header
-        lines, show only handful dhexigits prefix.  This is
+        lines, show only handful hexdigits prefix.  This is
         independent of --full-index option above, which controls
         the diff-patch output format.  Non default number of
         digits can be specified with --abbrev=&lt;n&gt;.
@@ -372,6 +408,22 @@ git-diff-tree(1) Manual Page
 </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>
@@ -415,6 +467,15 @@ git-diff-tree(1) Manual Page
 </p>
 </dd>
 <dt>
+--pickaxe-regex
+</dt>
+<dd>
+<p>
+        Make the &lt;string&gt; not a plain string but an extended POSIX
+        regex to match.
+</p>
+</dd>
+<dt>
 -O&lt;orderfile&gt;
 </dt>
 <dd>
@@ -503,7 +564,8 @@ separated with a single space are given.</p>
 <p>
         By default, "git-diff-tree --stdin" does not show
         differences for merge commits.  With this flag, it shows
-        differences to that commit from all of its parents.
+        differences to that commit from all of its parents. See
+        also <em>-c</em>.
 </p>
 </dd>
 <dt>
@@ -513,7 +575,7 @@ separated with a single space are given.</p>
 <p>
         By default, "git-diff-tree --stdin" shows differences,
         either in machine-readable form (without <em>-p</em>) or in patch
-        form (with <em>-p</em>).  This output can be supressed.  It is
+        form (with <em>-p</em>).  This output can be suppressed.  It is
         only useful with <em>-v</em> flag.
 </p>
 </dd>
@@ -545,6 +607,45 @@ separated with a single space are given.</p>
         applicable.  This flag suppressed the commit ID output.
 </p>
 </dd>
+<dt>
+-c
+</dt>
+<dd>
+<p>
+        This flag changes the way a merge commit is displayed
+        (which means it is useful only when the command is given
+        one &lt;tree-ish&gt;, or <em>--stdin</em>).  It shows the differences
+        from each of the parents to the merge result simultaneously
+        instead of showing pairwise diff between a parent and the
+        result one at a time (which is what the <em>-m</em> option does).
+        Furthermore, it lists only files which were modified
+        from all parents.
+</p>
+</dd>
+<dt>
+--cc
+</dt>
+<dd>
+<p>
+        This flag changes the way a merge commit patch is displayed,
+        in a similar way to the <em>-c</em> option. It implies the <em>-c</em>
+        and <em>-p</em> options and further compresses the patch output
+        by omitting hunks that show differences from only one
+        parent, or show the same change from all but one parent
+        for an Octopus merge.  When this optimization makes all
+        hunks disappear, the commit itself and the commit log
+        message is not shown, just like in any other "empty diff" case.
+</p>
+</dd>
+<dt>
+--always
+</dt>
+<dd>
+<p>
+        Show the commit itself and the commit log message even
+        if the diff itself is empty.
+</p>
+</dd>
 </dl>
 </div>
 <h2>Limiting Output</h2>
@@ -811,7 +912,7 @@ traditional diff format.</p>
 <ol>
 <li>
 <p>
-It is preceeded with a "git diff" header, that looks like
+It is preceded with a "git diff" header, that looks like
      this:
 </p>
 <div class="literalblock">
@@ -852,6 +953,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>
@@ -866,7 +1009,7 @@ TAB, LF, and backslash characters in pathnames are
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 27-Dec-2005 00:16:04 PDT
+Last updated 17-May-2006 10:34:02 UTC
 </div>
 </div>
 </body>
