From: Junio C Hamano <junio@hera.kernel.org>
Date: Tue, 4 Mar 2008 12:06:24 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.5.4.3-447-gc95b3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b022a5d9210de39138db2d53b13d6da2c8f364f;p=git.git

Autogenerated HTML docs for v1.5.4.3-447-gc95b3
---

diff --git a/config.txt b/config.txt
index 2091caa11..4027726f2 100644
--- a/config.txt
+++ b/config.txt
@@ -939,12 +939,6 @@ imap::
 	The configuration variables in the 'imap' section are described
 	in linkgit:git-imap-send[1].
 
-receive.fsckObjects::
-	If it is set to true, git-receive-pack will check all received
-	objects. It will abort in the case of a malformed object or a
-	broken link. The result of an abort are only dangling objects.
-	The default value is true.
-
 receive.unpackLimit::
 	If the number of objects received in a push is below this
 	limit then the objects will be unpacked into loose object
diff --git a/git-config.html b/git-config.html
index 1815c6e57..e39570eb7 100644
--- a/git-config.html
+++ b/git-config.html
@@ -2247,17 +2247,6 @@ imap
 </p>
 </dd>
 <dt>
-receive.fsckObjects
-</dt>
-<dd>
-<p>
-        If it is set to true, git-receive-pack will check all received
-        objects. It will abort in the case of a malformed object or a
-        broken link. The result of an abort are only dangling objects.
-        The default value is true.
-</p>
-</dd>
-<dt>
 receive.unpackLimit
 </dt>
 <dd>
@@ -2319,7 +2308,7 @@ web.browser
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Mar-2008 01:59:55 UTC
+Last updated 04-Mar-2008 12:05:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge.html b/git-merge.html
index cda152801..686ba7a77 100644
--- a/git-merge.html
+++ b/git-merge.html
@@ -501,7 +501,8 @@ branch.&lt;name&gt;.mergeoptions
 <h2>HOW MERGE WORKS</h2>
 <div class="sectionbody">
 <p>A merge is always between the current <tt>HEAD</tt> and one or more
-remote branch heads, and the index file must exactly match the
+commits (usually, branch head or tag), and the index file must
+exactly match the
 tree of <tt>HEAD</tt> commit (i.e. the contents of the last commit) when
 it happens.  In other words, <tt>git-diff --cached HEAD</tt> must
 report no changes.</p>
@@ -649,7 +650,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 17-Jan-2008 02:42:45 UTC
+Last updated 04-Mar-2008 12:05:57 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge.txt b/git-merge.txt
index 0c9ad7f2b..c136b1069 100644
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -68,7 +68,8 @@ HOW MERGE WORKS
 ---------------
 
 A merge is always between the current `HEAD` and one or more
-remote branch heads, and the index file must exactly match the
+commits (usually, branch head or tag), and the index file must
+exactly match the
 tree of `HEAD` commit (i.e. the contents of the last commit) when
 it happens.  In other words, `git-diff --cached HEAD` must
 report no changes.
diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index c35fbe917..4adbc12a9 100644
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -317,14 +317,6 @@ new packs and replace existing ones.</p>
         possible.
 </p>
 </dd>
-<dt>
---strict
-</dt>
-<dd>
-<p>
-        Don't write objects with broken content or links.
-</p>
-</dd>
 </dl>
 </div>
 <h2>Author</h2>
@@ -341,7 +333,7 @@ new packs and replace existing ones.</p>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 03-Mar-2008 02:00:00 UTC
+Last updated 04-Mar-2008 12:05:58 UTC
 </div>
 </div>
 </body>
diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt
index 3697896a0..b79be3fd4 100644
--- a/git-unpack-objects.txt
+++ b/git-unpack-objects.txt
@@ -40,9 +40,6 @@ OPTIONS
 	and make the best effort to recover as many objects as
 	possible.
 
---strict::
-	Don't write objects with broken content or links.
-
 
 Author
 ------