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

diff --git a/git-diff-tree.html b/git-diff-tree.html
index f44a2fc2..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 {
@@ -304,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>
@@ -375,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>
@@ -418,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>
@@ -506,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>
@@ -549,22 +608,42 @@ separated with a single space are given.</p>
 </p>
 </dd>
 <dt>
--c,--cc
+-c
 </dt>
 <dd>
 <p>
-        These flags change the way a merge commit is displayed
+        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 <em>-m</em> option
-        output does.  <em>--cc</em> further compresses the output by
-        omiting hunks that show differences from only one
+        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 any other "empty diff" cases.
+        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>
@@ -930,7 +1009,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Feb-2006 15:49:55 PDT
+Last updated 17-May-2006 10:34:02 UTC
 </div>
 </div>
 </body>
