From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 26 Jul 2007 02:14:34 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.3-rc3-7-gd58e
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6936156b92bf31acd8e14b74ddf5b83a59de50f6;p=git.git

Autogenerated HTML docs for v1.5.3-rc3-7-gd58e
---

diff --git a/diff-options.txt b/diff-options.txt
index 3d2b9d0a0..82165763b 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -4,6 +4,13 @@
 -u::
 	Synonym for "-p".
 
+-U<n>::
+	Shorthand for "--unified=<n>".
+
+--unified=<n>::
+	Generate diffs with <n> lines of context instead of
+	the usual three. Implies "-p".
+
 --raw::
 	Generate the raw format.
 
diff --git a/git-diff-files.html b/git-diff-files.html
index f12d5e37d..c5e961c0b 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -301,6 +301,23 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>
 </dd>
 <dt>
+-U&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Shorthand for "--unified=&lt;n&gt;".
+</p>
+</dd>
+<dt>
+--unified=&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Generate diffs with &lt;n&gt; lines of context instead of
+        the usual three. Implies "-p".
+</p>
+</dd>
+<dt>
 --raw
 </dt>
 <dd>
@@ -1094,7 +1111,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Jul-2007 02:09:37 UTC
+Last updated 26-Jul-2007 02:14:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-index.html b/git-diff-index.html
index 073ac418d..4f858471d 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -302,6 +302,23 @@ entries in the index are compared.</p>
 </p>
 </dd>
 <dt>
+-U&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Shorthand for "--unified=&lt;n&gt;".
+</p>
+</dd>
+<dt>
+--unified=&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Generate diffs with &lt;n&gt; lines of context instead of
+        the usual three. Implies "-p".
+</p>
+</dd>
+<dt>
 --raw
 </dt>
 <dd>
@@ -1176,7 +1193,7 @@ always have the special all-zero sha1.</td>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Jul-2007 02:09:38 UTC
+Last updated 26-Jul-2007 02:14:01 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff-tree.html b/git-diff-tree.html
index bd505f816..afeeab55c 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -304,6 +304,23 @@ git-diff-tree(1) Manual Page
 </p>
 </dd>
 <dt>
+-U&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Shorthand for "--unified=&lt;n&gt;".
+</p>
+</dd>
+<dt>
+--unified=&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Generate diffs with &lt;n&gt; lines of context instead of
+        the usual three. Implies "-p".
+</p>
+</dd>
+<dt>
 --raw
 </dt>
 <dd>
@@ -1564,7 +1581,7 @@ two unresolved merge parents with the working tree file
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 25-Jul-2007 08:53:09 UTC
+Last updated 26-Jul-2007 02:14:03 UTC
 </div>
 </div>
 </body>
diff --git a/git-diff.html b/git-diff.html
index a0fb76d93..0fb9d85f3 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -356,6 +356,23 @@ any &lt;tree-ish&gt;.</p>
 </p>
 </dd>
 <dt>
+-U&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Shorthand for "--unified=&lt;n&gt;".
+</p>
+</dd>
+<dt>
+--unified=&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Generate diffs with &lt;n&gt; lines of context instead of
+        the usual three. Implies "-p".
+</p>
+</dd>
+<dt>
 --raw
 </dt>
 <dd>
@@ -879,7 +896,7 @@ output diff in reverse.
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Jul-2007 02:09:38 UTC
+Last updated 26-Jul-2007 02:14:04 UTC
 </div>
 </div>
 </body>
diff --git a/git-format-patch.html b/git-format-patch.html
index 3c1f49456..ac39fd689 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -327,6 +327,23 @@ reference.</p>
 </p>
 </dd>
 <dt>
+-U&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Shorthand for "--unified=&lt;n&gt;".
+</p>
+</dd>
+<dt>
+--unified=&lt;n&gt;
+</dt>
+<dd>
+<p>
+        Generate diffs with &lt;n&gt; lines of context instead of
+        the usual three. Implies "-p".
+</p>
+</dd>
+<dt>
 --raw
 </dt>
 <dd>
@@ -930,7 +947,7 @@ git-format-patch -3
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 19-Jul-2007 02:09:41 UTC
+Last updated 26-Jul-2007 02:14:06 UTC
 </div>
 </div>
 </body>