From: Junio C Hamano <junio@hera.kernel.org>
Date: Mon, 10 Sep 2007 01:33:28 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.3.1-27-g57543
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=250f03e4da02e3baac97034efeb8d122e0d6b207;p=git.git

Autogenerated HTML docs for v1.5.3.1-27-g57543
---

diff --git a/git-clone.html b/git-clone.html
index ec14ecb17..24c834419 100644
--- a/git-clone.html
+++ b/git-clone.html
@@ -352,7 +352,7 @@ configuration variables.</p>
         automatically setup .git/objects/info/alternates to
         obtain objects from the reference repository.  Using
         an already existing repository as an alternate will
-        require less objects to be copied from the repository
+        require fewer objects to be copied from the repository
         being cloned, reducing network and local storage costs.
 </p>
 </dd>
@@ -641,7 +641,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 01-Sep-2007 11:16:23 UTC
+Last updated 10-Sep-2007 01:32:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-clone.txt b/git-clone.txt
index 227f092e2..253f4f03c 100644
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -68,7 +68,7 @@ OPTIONS
 	automatically setup .git/objects/info/alternates to
 	obtain objects from the reference repository.  Using
 	an already existing repository as an alternate will
-	require less objects to be copied from the repository
+	require fewer objects to be copied from the repository
 	being cloned, reducing network and local storage costs.
 
 --quiet::
diff --git a/git-rebase.html b/git-rebase.html
index 1599bd5a1..362b931a0 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -273,8 +273,9 @@ git-rebase(1) Manual Page
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge] [-C&lt;n&gt;]
-        [-p | --preserve-merges] [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]
+<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge]
+        [-C&lt;n&gt;] [ --whitespace=&lt;option&gt;] [-p | --preserve-merges]
+        [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]
 <em>git-rebase</em> --continue | --skip | --abort</div></div>
 </div>
 <h2>DESCRIPTION</h2>
@@ -510,6 +511,15 @@ desired resolution, you can continue the rebasing process with</p>
 </p>
 </dd>
 <dt>
+--whitespace=&lt;nowarn|warn|error|error-all|strip&gt;
+</dt>
+<dd>
+<p>
+        This flag is passed to the <tt>git-apply</tt> program
+        (see <a href="git-apply.html">git-apply(1)</a>) that applies the patch.
+</p>
+</dd>
+<dt>
 -i, --interactive
 </dt>
 <dd>
@@ -800,7 +810,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 02-Sep-2007 06:24:43 UTC
+Last updated 10-Sep-2007 01:32:39 UTC
 </div>
 </div>
 </body>
diff --git a/git-rebase.txt b/git-rebase.txt
index 61b1810db..0858fa8a6 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -8,8 +8,9 @@ git-rebase - Forward-port local commits to the updated upstream head
 SYNOPSIS
 --------
 [verse]
-'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge] [-C<n>]
-	[-p | --preserve-merges] [--onto <newbase>] <upstream> [<branch>]
+'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
+	[-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
+	[--onto <newbase>] <upstream> [<branch>]
 'git-rebase' --continue | --skip | --abort
 
 DESCRIPTION
@@ -209,6 +210,10 @@ OPTIONS
 	context exist they all must match.  By default no context is
 	ever ignored.
 
+--whitespace=<nowarn|warn|error|error-all|strip>::
+	This flag is passed to the `git-apply` program
+	(see gitlink:git-apply[1]) that applies the patch.
+
 -i, \--interactive::
 	Make a list of the commits which are about to be rebased.  Let the
 	user edit that list before rebasing.  This mode can also be used to