Autogenerated HTML docs for v1.3.3-gd5e3d

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

diff --git a/git-diff-stages.html b/git-diff-stages.html
index 037cef6..82a423f 100644 (file)
--- a/git-diff-stages.html
+++ b/git-diff-stages.html
@@ -266,7 +266,7 @@ git-diff-stages(1) Manual Page
 <h2>NAME</h2>\r
 <div class="sectionbody">\r
 <p>git-diff-stages -\r
-   Compares content and mode of blobs between stages in an unmerged index file.\r
+   Compares content and mode of blobs between stages in an unmerged index file\r
 </p>\r
 </div>\r
 </div>\r
@@ -299,6 +299,39 @@ unmerged index file.</p>
 </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
@@ -429,6 +462,15 @@ unmerged index file.</p>
 </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
@@ -779,7 +821,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:46 UTC\r
+Last updated 17-May-2006 10:34:01 UTC\r
 </div>\r
 </div>\r
 </body>\r