Autogenerated HTML docs for v1.5.3.1-27-g57543

diff --git a/git-clone.html b/git-clone.html
index ec14ecb17819307c4f0ec849a1c8ac76381fabc9..24c834419e116576ef0e9ed0e2fb2c534e1e50f5 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -352,7 +352,7 @@ configuration variables.</p>
         automatically setup .git/objects/info/alternates to\r
         obtain objects from the reference repository.  Using\r
         an already existing repository as an alternate will\r
-        require less objects to be copied from the repository\r
+        require fewer objects to be copied from the repository\r
         being cloned, reducing network and local storage costs.\r
 </p>\r
 </dd>\r
@@ -641,7 +641,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 01-Sep-2007 11:16:23 UTC\r
+Last updated 10-Sep-2007 01:32:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.txt b/git-clone.txt
index 227f092e268497aad9c16cff4d796dabf60401de..253f4f03c532eb34912f1b5f570f3f6359692fb9 100644 (file)
--- 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 1599bd5a1fad70594110dc874c7e8a15553f551b..362b931a0ac456d614f83f839e688f5b00b8cdbb 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -273,8 +273,9 @@ git-rebase(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge] [-C&lt;n&gt;]\r
-        [-p | --preserve-merges] [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]\r
+<div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge]\r
+        [-C&lt;n&gt;] [ --whitespace=&lt;option&gt;] [-p | --preserve-merges]\r
+        [--onto &lt;newbase&gt;] &lt;upstream&gt; [&lt;branch&gt;]\r
 <em>git-rebase</em> --continue | --skip | --abort</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -510,6 +511,15 @@ desired resolution, you can continue the rebasing process with</p>
 </p>\r
 </dd>\r
 <dt>\r
+--whitespace=&lt;nowarn|warn|error|error-all|strip&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        This flag is passed to the <tt>git-apply</tt> program\r
+        (see <a href="git-apply.html">git-apply(1)</a>) that applies the patch.\r
+</p>\r
+</dd>\r
+<dt>\r
 -i, --interactive\r
 </dt>\r
 <dd>\r
@@ -800,7 +810,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 02-Sep-2007 06:24:43 UTC\r
+Last updated 10-Sep-2007 01:32:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index 61b1810dbaa56bdc43364ea10d9a5ea0d532f1be..0858fa8a6326a0c457bc9b4bb63ae35d3001ef65 100644 (file)
--- 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