Autogenerated HTML docs for v1.5.4.3-447-gc95b3

diff --git a/config.txt b/config.txt
index 2091caa111a5a25ee983198437fd25aa52999b51..4027726f2ee66ebad69412a5c8c6d1aef7f7463f 100644 (file)
--- 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 1815c6e571eb096987dc4605f8461741158375cb..e39570eb778de1fcc92e2af0fe48af1d9ac5b3e2 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -2247,17 +2247,6 @@ imap
 </p>\r
 </dd>\r
 <dt>\r
-receive.fsckObjects\r
-</dt>\r
-<dd>\r
-<p>\r
-        If it is set to true, git-receive-pack will check all received\r
-        objects. It will abort in the case of a malformed object or a\r
-        broken link. The result of an abort are only dangling objects.\r
-        The default value is true.\r
-</p>\r
-</dd>\r
-<dt>\r
 receive.unpackLimit\r
 </dt>\r
 <dd>\r
@@ -2319,7 +2308,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Mar-2008 01:59:55 UTC\r
+Last updated 04-Mar-2008 12:05:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.html b/git-merge.html
index cda152801a6675c0f495ffd160eb0cc4aa1abc7a..686ba7a77bd4af5e69efe6107900d42b7c309e32 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -501,7 +501,8 @@ branch.<name>.mergeoptions
 <h2>HOW MERGE WORKS</h2>\r
 <div class="sectionbody">\r
 <p>A merge is always between the current <tt>HEAD</tt> and one or more\r
-remote branch heads, and the index file must exactly match the\r
+commits (usually, branch head or tag), and the index file must\r
+exactly match the\r
 tree of <tt>HEAD</tt> commit (i.e. the contents of the last commit) when\r
 it happens.  In other words, <tt>git-diff --cached HEAD</tt> must\r
 report no changes.</p>\r
@@ -649,7 +650,7 @@ Resolve the conflicts.  <tt>git-diff</tt> would report only the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Jan-2008 02:42:45 UTC\r
+Last updated 04-Mar-2008 12:05:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.txt b/git-merge.txt
index 0c9ad7f2bbdf4872882d127804e7c474729c0818..c136b1069230af55b62ba95a1b40bdcc019b7b42 100644 (file)
--- 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 c35fbe9172eed39b61b9e466d50fc2b6dd28f1a5..4adbc12a9ded827b29bb3fd9f696aa7a1c794e30 100644 (file)
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -317,14 +317,6 @@ new packs and replace existing ones.</p>
         possible.\r
 </p>\r
 </dd>\r
-<dt>\r
---strict\r
-</dt>\r
-<dd>\r
-<p>\r
-        Don't write objects with broken content or links.\r
-</p>\r
-</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -341,7 +333,7 @@ new packs and replace existing ones.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 03-Mar-2008 02:00:00 UTC\r
+Last updated 04-Mar-2008 12:05:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt
index 3697896a06b460d9d29f962240dc46388487990a..b79be3fd4ced9dac416fb0fb7f97ab2d10775d01 100644 (file)
--- 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
 ------