Autogenerated HTML docs for v1.4.2.1-g3852

diff --git a/core-tutorial.html b/core-tutorial.html
index b012aab64971dff193565d297198c0a969269b26..7073b3ac6ae352cffe014e21dfc71feb1ad431be 100644 (file)
--- a/core-tutorial.html
+++ b/core-tutorial.html
@@ -1917,7 +1917,7 @@ Use <tt>git format-patch origin</tt> to prepare patches for e-mail
 suggested in the previous section may be new to you. You do not\r
 have to worry. git supports "shared public repository" style of\r
 cooperation you are probably more familiar with as well.</p>\r
-<p>See <a href="cvs-migration.txt">git for CVS users</a> for the details.</p>\r
+<p>See <a href="cvs-migration.html">git for CVS users</a> for the details.</p>\r
 </div>\r
 <h2>Bundling your work together</h2>\r
 <div class="sectionbody">\r
@@ -2011,7 +2011,7 @@ to follow, not easier.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:27 UTC\r
+Last updated 14-Sep-2006 07:38:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/core-tutorial.txt b/core-tutorial.txt
index 1185897f7078a83bebce0366192038f72bbc1d84..47505aa20a56b4dc29fad86d66e8c6638edf03e0 100644 (file)
--- a/core-tutorial.txt
+++ b/core-tutorial.txt
@@ -1620,7 +1620,7 @@ suggested in the previous section may be new to you. You do not
 have to worry. git supports "shared public repository" style of
 cooperation you are probably more familiar with as well.
 
-See link:cvs-migration.txt[git for CVS users] for the details.
+See link:cvs-migration.html[git for CVS users] for the details.
 
 Bundling your work together
 ---------------------------

diff --git a/cvs-migration.html b/cvs-migration.html
index 058b5440e040e274c824e0c6daeec2e6fe4045db..6560db47a0fb225db54db9de598cf48de2f32c1b 100644 (file)
--- a/cvs-migration.html
+++ b/cvs-migration.html
@@ -438,7 +438,7 @@ repository.</p>
 <div class="sectionbody">\r
 <p>Git allows you to specify scripts called "hooks" to be run at certain\r
 points.  You can use these, for example, to send all commits to the shared\r
-repository to a mailing list.  See <a href="hooks.txt">Hooks used by git</a>.</p>\r
+repository to a mailing list.  See <a href="hooks.html">Hooks used by git</a>.</p>\r
 <p>You can enforce finer grained permissions using update hooks.  See\r
 <a href="howto/update-hook-example.txt">Controlling access to branches using\r
 update hooks</a>.</p>\r
@@ -579,7 +579,7 @@ that contain this changed "if" statement:</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:29 UTC\r
+Last updated 14-Sep-2006 07:38:14 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/cvs-migration.txt b/cvs-migration.txt
index d2b0bd38de7fb39ccff5687013784ea8ceb22f1c..6812683a16852ea165dff7dd0582b53138e3f12c 100644 (file)
--- a/cvs-migration.txt
+++ b/cvs-migration.txt
@@ -172,7 +172,7 @@ Advanced Shared Repository Management
 
 Git allows you to specify scripts called "hooks" to be run at certain
 points.  You can use these, for example, to send all commits to the shared
-repository to a mailing list.  See link:hooks.txt[Hooks used by git].
+repository to a mailing list.  See link:hooks.html[Hooks used by git].
 
 You can enforce finer grained permissions using update hooks.  See
 link:howto/update-hook-example.txt[Controlling access to branches using

diff --git a/git-apply.html b/git-apply.html
index 733a07544475dd385b8cd88fb08ec2cd1ca416e2..84af247e5eecf1358da902a00de03ce963e2e0fb 100644 (file)
--- a/git-apply.html
+++ b/git-apply.html
@@ -454,15 +454,10 @@ and a work tree.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        When applying a patch, which is a git-enhanced patch\r
-        that was prepared to record the pre- and post-image object\r
-        name in full, and the path being patched exactly matches\r
-        the object the patch applies to (i.e. "index" line's\r
-        pre-image object name is what is in the working tree),\r
-        and the post-image object is available in the object\r
-        database, use the post-image object as the patch\r
-        result.  This allows binary files to be patched in a\r
-        very limited way.\r
+        Historically we did not allow binary patch applied\r
+        without an explicit permission from the user, and this\r
+        flag was the way to do so.  Currently we always allow binary\r
+        patch application, so this is a no-op.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -573,7 +568,7 @@ apply.whitespace
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Aug-2006 07:18:32 UTC\r
+Last updated 14-Sep-2006 07:38:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-apply.txt b/git-apply.txt
index c76cfffdc6cd9982aa02e34b2b09fc22897e7402..0a6f7b32192df8a8a2266b0d302271a62c612b1f 100644 (file)
--- a/git-apply.txt
+++ b/git-apply.txt
@@ -110,15 +110,10 @@ OPTIONS
        deletion part but not addition part.
 
 --allow-binary-replacement, --binary::
-       When applying a patch, which is a git-enhanced patch
-       that was prepared to record the pre- and post-image object
-       name in full, and the path being patched exactly matches
-       the object the patch applies to (i.e. "index" line's
-       pre-image object name is what is in the working tree),
-       and the post-image object is available in the object
-       database, use the post-image object as the patch
-       result.  This allows binary files to be patched in a
-       very limited way.
+       Historically we did not allow binary patch applied
+       without an explicit permission from the user, and this
+       flag was the way to do so.  Currently we always allow binary
+       patch application, so this is a no-op.
 
 --exclude=<path-pattern>::
        Don't apply changes to files matching the given path pattern. This can

diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index ab2e814ee03b3b7bfeee78ec7b81b6468e77ec9a..881d3c5b124b1fd58b4fed227e8ae7417a3cb257 100644 (file)
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -272,7 +272,7 @@ git-unpack-objects(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-unpack-objects</em> [-n] [-q] &lt;pack-file</p>\r
+<p><em>git-unpack-objects</em> [-n] [-q] [-r] &lt;pack-file</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -306,6 +306,17 @@ new packs and replace existing ones.</p>
         flag suppresses it.\r
 </p>\r
 </dd>\r
+<dt>\r
+-r\r
+</dt>\r
+<dd>\r
+<p>\r
+        When unpacking a corrupt packfile, the command dies at\r
+        the first corruption.  This flag tells it to keep going\r
+        and make the best effort to recover as many objects as\r
+        possible.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -322,7 +333,7 @@ new packs and replace existing ones.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 15-Jul-2006 01:38:18 UTC\r
+Last updated 14-Sep-2006 07:38:11 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt
index c20b38b08adca264316f35b064153213a0bfd7c3..ff6184b0f7498a44995fe4c55dab49c5517ec458 100644 (file)
--- a/git-unpack-objects.txt
+++ b/git-unpack-objects.txt
@@ -8,7 +8,7 @@ git-unpack-objects - Unpack objects from a packed archive
 
 SYNOPSIS
 --------
-'git-unpack-objects' [-n] [-q] <pack-file
+'git-unpack-objects' [-n] [-q] [-r] <pack-file
 
 
 DESCRIPTION
@@ -34,6 +34,12 @@ OPTIONS
        The command usually shows percentage progress.  This
        flag suppresses it.
 
+-r::
+       When unpacking a corrupt packfile, the command dies at
+       the first corruption.  This flag tells it to keep going
+       and make the best effort to recover as many objects as
+       possible.
+
 
 Author
 ------

diff --git a/tutorial-2.html b/tutorial-2.html
index c277ea012ef88f381a942820067848b2079b0d73..bab8ca41ae72c441d61cd52c62f38b948b64d931 100644 (file)
--- a/tutorial-2.html
+++ b/tutorial-2.html
@@ -614,7 +614,7 @@ in the index file is identical to the one in the working directory.</p>
 <p>In addition to being the staging area for new commits, the index file\r
 is also populated from the object database when checking out a\r
 branch, and is used to hold the trees involved in a merge operation.\r
-See the <a href="core-tutorial.txt">core tutorial</a> and the relevant man\r
+See the <a href="core-tutorial.html">core tutorial</a> and the relevant man\r
 pages for details.</p>\r
 </div>\r
 <h2>What next?</h2>\r
@@ -635,7 +635,7 @@ example, creating a new commit.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Aug-2006 00:18:00 UTC\r
+Last updated 14-Sep-2006 07:38:12 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/tutorial-2.txt b/tutorial-2.txt
index 2f4fe1217a3cd6d9d958130ca5e03c68b027abc1..42b6e7d7d2bbb24d96f29635967945f516b25e15 100644 (file)
--- a/tutorial-2.txt
+++ b/tutorial-2.txt
@@ -368,7 +368,7 @@ in the index file is identical to the one in the working directory.
 In addition to being the staging area for new commits, the index file
 is also populated from the object database when checking out a
 branch, and is used to hold the trees involved in a merge operation.
-See the link:core-tutorial.txt[core tutorial] and the relevant man
+See the link:core-tutorial.html[core tutorial] and the relevant man
 pages for details.
 
 What next?