Autogenerated HTML docs for v1.3.3-g288c

[git.git] / git-diff-tree.html

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 4ced030..bab73a8 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -304,6 +304,39 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--patch-with-raw\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate patch but keep also the default raw diff output.\r
+</p>\r
+</dd>\r
+<dt>\r
+--stat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate a diffstat instead of a patch.\r
+</p>\r
+</dd>\r
+<dt>\r
+--summary\r
+</dt>\r
+<dd>\r
+<p>\r
+        Output a condensed summary of extended header information\r
+        such as creations, renames and mode changes.\r
+</p>\r
+</dd>\r
+<dt>\r
+--patch-with-stat\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate patch and prepend its diffstat.\r
+</p>\r
+</dd>\r
+<dt>\r
 -z\r
 </dt>\r
 <dd>\r
@@ -434,6 +467,15 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--pickaxe-regex\r
+</dt>\r
+<dd>\r
+<p>\r
+        Make the &lt;string&gt; not a plain string but an extended POSIX\r
+        regex to match.\r
+</p>\r
+</dd>\r
+<dt>\r
 -O&lt;orderfile&gt;\r
 </dt>\r
 <dd>\r
@@ -522,7 +564,8 @@ separated with a single space are given.</p>
 <p>\r
         By default, "git-diff-tree --stdin" does not show\r
         differences for merge commits.  With this flag, it shows\r
-        differences to that commit from all of its parents.\r
+        differences to that commit from all of its parents. See\r
+        also <em>-c</em>.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -565,22 +608,33 @@ separated with a single space are given.</p>
 </p>\r
 </dd>\r
 <dt>\r
--c,--cc\r
+-c\r
 </dt>\r
 <dd>\r
 <p>\r
-        These flags change the way a merge commit is displayed\r
+        This flag changes the way a merge commit is displayed\r
         (which means it is useful only when the command is given\r
         one &lt;tree-ish&gt;, or <em>--stdin</em>).  It shows the differences\r
-        from each of the parents to the merge result\r
-        simultaneously, instead of showing pairwise diff between\r
-        a parent and the result one at a time, which <em>-m</em> option\r
-        output does.  <em>--cc</em> further compresses the output by\r
-        omiting hunks that show differences from only one\r
+        from each of the parents to the merge result simultaneously\r
+        instead of showing pairwise diff between a parent and the\r
+        result one at a time (which is what the <em>-m</em> option does).\r
+        Furthermore, it lists only files which were modified\r
+        from all parents.\r
+</p>\r
+</dd>\r
+<dt>\r
+--cc\r
+</dt>\r
+<dd>\r
+<p>\r
+        This flag changes the way a merge commit patch is displayed,\r
+        in a similar way to the <em>-c</em> option. It implies the <em>-c</em>\r
+        and <em>-p</em> options and further compresses the patch output\r
+        by omitting hunks that show differences from only one\r
         parent, or show the same change from all but one parent\r
         for an Octopus merge.  When this optimization makes all\r
         hunks disappear, the commit itself and the commit log\r
-        message is not shown, just like any other "empty diff" cases.\r
+        message is not shown, just like in any other "empty diff" case.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -955,7 +1009,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Feb-2006 05:51:47 UTC\r
+Last updated 17-May-2006 10:34:02 UTC\r
 </div>\r
 </div>\r
 </body>\r