Autogenerated HTML docs for v1.5.4.3-422-g34cd6

diff --git a/config.txt b/config.txt
index 4027726f2ee66ebad69412a5c8c6d1aef7f7463f..2091caa111a5a25ee983198437fd25aa52999b51 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -939,6 +939,12 @@ 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 c826e1a0b459acfa489882229bec17e7ed59c6f5..1815c6e571eb096987dc4605f8461741158375cb 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -2247,6 +2247,17 @@ 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
@@ -2308,7 +2319,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Feb-2008 00:25:38 UTC\r
+Last updated 03-Mar-2008 01:59:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsimport.html b/git-cvsimport.html
index 6b7338f2d61ac777243aea3c53232717ffba59a3..11c1b8e4987231f5543b9b47b020fa8b031dd013 100644 (file)
--- a/git-cvsimport.html
+++ b/git-cvsimport.html
@@ -430,7 +430,7 @@ the old cvs2git tool.</p>
 <dd>\r
 <p>\r
         Attempt to detect merges based on the commit message. This option\r
-        will enable default regexes that try to capture the name source\r
+        will enable default regexes that try to capture the source\r
         branch name from the commit message.\r
 </p>\r
 </dd>\r
@@ -443,6 +443,8 @@ the old cvs2git tool.</p>
         regex. It can be used with <em>-m</em> to enable the default regexes\r
         as well. You must escape forward slashes.\r
 </p>\r
+<p>The regex must capture the source branch name in $1.</p>\r
+<p>This option can be used several times to provide several detection regexes.</p>\r
 </dd>\r
 <dt>\r
 -S &lt;regex&gt;\r
@@ -526,7 +528,7 @@ various participants of the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Feb-2008 00:51:07 UTC\r
+Last updated 03-Mar-2008 01:59:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsimport.txt b/git-cvsimport.txt
index 6f91b9ea2a17df8fc8e3c00fdf0d5c74a6c17950..58eefd42e504cf34178719080fd4f75a0b9ea621 100644 (file)
--- a/git-cvsimport.txt
+++ b/git-cvsimport.txt
@@ -102,13 +102,17 @@ If you need to pass multiple options, separate them with a comma.
 
 -m::
        Attempt to detect merges based on the commit message. This option
-       will enable default regexes that try to capture the name source
+       will enable default regexes that try to capture the source
        branch name from the commit message.
 
 -M <regex>::
        Attempt to detect merges based on the commit message with a custom
        regex. It can be used with '-m' to enable the default regexes
        as well. You must escape forward slashes.
++
+The regex must capture the source branch name in $1.
++
+This option can be used several times to provide several detection regexes.
 
 -S <regex>::
        Skip paths matching the regex.

diff --git a/git-describe.html b/git-describe.html
index 6e851d7d6abbcb249defa2a8d7038d996ffad029..94d633db8973a81cd4fde0e3da98ad02143bac22 100644 (file)
--- a/git-describe.html
+++ b/git-describe.html
@@ -361,6 +361,20 @@ additional commits and the abbreviated object name of the commit.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--long\r
+</dt>\r
+<dd>\r
+<p>\r
+        Always output the long format (the tag, the number of commits\r
+        and the abbreviated commit name) even when it matches a tag.\r
+        This is useful when you want to see parts of the commit object name\r
+        in "describe" output, even when the commit in question happens to be\r
+        a tagged version.  Instead of just emitting the tag name, it will\r
+        describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2\r
+        that points at object deadbeef&#8230;.).\r
+</p>\r
+</dd>\r
+<dt>\r
 --match &lt;pattern&gt;\r
 </dt>\r
 <dd>\r
@@ -447,7 +461,7 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Feb-2008 00:25:38 UTC\r
+Last updated 03-Mar-2008 01:59:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.txt b/git-describe.txt
index fbb40a29165a47e627358b5b9f8afb50e84958cd..d9aa2f29809eb07385468edd2587daf55339389a 100644 (file)
--- a/git-describe.txt
+++ b/git-describe.txt
@@ -56,6 +56,15 @@ OPTIONS
        being employed to standard error.  The tag name will still
        be printed to standard out.
 
+--long::
+       Always output the long format (the tag, the number of commits
+       and the abbreviated commit name) even when it matches a tag.
+       This is useful when you want to see parts of the commit object name
+       in "describe" output, even when the commit in question happens to be
+       a tagged version.  Instead of just emitting the tag name, it will
+       describe such a commit as v1.2-0-deadbeef (0th commit since tag v1.2
+       that points at object deadbeef....).
+
 --match <pattern>::
        Only consider tags matching the given pattern (can be used to avoid
        leaking private tags made from the repository).

diff --git a/git-grep.html b/git-grep.html
index ea369821f4e963cd98d164aaa1cc1338ee75ab48..4f953b092e897d36794554aa89becde83c32e987 100644 (file)
--- a/git-grep.html
+++ b/git-grep.html
@@ -401,7 +401,7 @@ registered in the index file, or given tree objects.</p>
 <p>\r
         Instead of showing every matched line, show only the\r
         names of files that contain (or do not contain) matches.\r
-        For better compatability with git-diff, --name-only is a\r
+        For better compatibility with git-diff, --name-only is a\r
         synonym for --files-with-matches.\r
 </p>\r
 </dd>\r
@@ -530,7 +530,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 22-Feb-2008 22:56:35 UTC\r
+Last updated 03-Mar-2008 01:59:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.txt b/git-grep.txt
index 71a73354f8cfa960f641d9563ee8af405b4f881f..a97f0557f4aa6cf1d795470d7bbe94ce35abc56a 100644 (file)
--- a/git-grep.txt
+++ b/git-grep.txt
@@ -78,7 +78,7 @@ OPTIONS
 -l | --files-with-matches | --name-only | -L | --files-without-match::
        Instead of showing every matched line, show only the
        names of files that contain (or do not contain) matches.
-       For better compatability with git-diff, --name-only is a
+       For better compatibility with git-diff, --name-only is a
        synonym for --files-with-matches.
 
 -c | --count::

diff --git a/git-index-pack.html b/git-index-pack.html
index 28ba3ae791d686e3262c0933a0ba3dea6845ec4e..05e36846c61b38df23eaf213dabd1a53d56c2a52 100644 (file)
--- a/git-index-pack.html
+++ b/git-index-pack.html
@@ -373,6 +373,14 @@ objects/pack/ directory of a git repository.</p>
         64-bit index entries on objects located above the given offset.\r
 </p>\r
 </dd>\r
+<dt>\r
+--strict\r
+</dt>\r
+<dd>\r
+<p>\r
+        Die, if the pack contains broken objects or links.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Note</h2>\r
@@ -398,7 +406,7 @@ mentioned above.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:26 UTC\r
+Last updated 03-Mar-2008 01:59:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-index-pack.txt b/git-index-pack.txt
index 72b5d001161f8a05e9c132b15409d7a504b0ced3..a7825b6144b67d486b5b81be0217b57db5197e65 100644 (file)
--- a/git-index-pack.txt
+++ b/git-index-pack.txt
@@ -75,6 +75,9 @@ OPTIONS
        to force the version for the generated pack index, and to force
        64-bit index entries on objects located above the given offset.
 
+--strict::
+       Die, if the pack contains broken objects or links.
+
 
 Note
 ----

diff --git a/git-log.html b/git-log.html
index 0c3eba74d8dd29b5b5ae2120f0f232f08b1ac3a4..eb1872eaf1b1dd2339b4b176b383d0f7c1db2721 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -1013,14 +1013,6 @@ limiting may be applied.</p>
 </p>\r
 </dd>\r
 <dt>\r
---max-age=<em>timestamp</em>, --min-age=<em>timestamp</em>\r
-</dt>\r
-<dd>\r
-<p>\r
-        Limit the commits output to specified time range.\r
-</p>\r
-</dd>\r
-<dt>\r
 --author=<em>pattern</em>, --committer=<em>pattern</em>\r
 </dt>\r
 <dd>\r
@@ -1916,7 +1908,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Feb-2008 00:25:42 UTC\r
+Last updated 03-Mar-2008 01:59:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.html b/git-rebase.html
index d0cc962e9fa6435672b543022403dd24342824ef..bdc1516cf0fccd16687aecdeee746b0e4fba3f32 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -274,6 +274,7 @@ git-rebase(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-rebase</em> [-i | --interactive] [-v | --verbose] [-m | --merge]\r
+        [-s &lt;strategy&gt; | --strategy=&lt;strategy&gt;]\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
@@ -831,7 +832,7 @@ Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:39 UTC\r
+Last updated 03-Mar-2008 01:59:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index c11c6453ea5d6cc8d7a727e66dafc6e628ea5b2e..4b10304740f5035095c19be05859ae0b9205e9a0 100644 (file)
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -9,6 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git-rebase' [-i | --interactive] [-v | --verbose] [-m | --merge]
+       [-s <strategy> | --strategy=<strategy>]
        [-C<n>] [ --whitespace=<option>] [-p | --preserve-merges]
        [--onto <newbase>] <upstream> [<branch>]
 'git-rebase' --continue | --skip | --abort

diff --git a/git-rev-list.html b/git-rev-list.html
index cbfc86e1db1c4021d01738c8e55146e70c99563e..419a03a05f730e5294fc32f4db41f424841a5b5d 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -1204,7 +1204,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Feb-2008 09:20:49 UTC\r
+Last updated 03-Mar-2008 01:59:59 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-objects.html b/git-unpack-objects.html
index eee01c711f53aaaea707ddb4b21e4dcf7463c99f..c35fbe9172eed39b61b9e466d50fc2b6dd28f1a5 100644 (file)
--- a/git-unpack-objects.html
+++ b/git-unpack-objects.html
@@ -317,6 +317,14 @@ 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
@@ -333,7 +341,7 @@ new packs and replace existing ones.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:55 UTC\r
+Last updated 03-Mar-2008 02:00:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt
index b79be3fd4ced9dac416fb0fb7f97ab2d10775d01..3697896a06b460d9d29f962240dc46388487990a 100644 (file)
--- a/git-unpack-objects.txt
+++ b/git-unpack-objects.txt
@@ -40,6 +40,9 @@ OPTIONS
        and make the best effort to recover as many objects as
        possible.
 
+--strict::
+       Don't write objects with broken content or links.
+
 
 Author
 ------

diff --git a/git-verify-pack.html b/git-verify-pack.html
index 5a792458b109172f4cd1c6973eec8cf44146d9dc..2be9d3da0ea668f0a923b90aff7e59e24bf31e40 100644 (file)
--- a/git-verify-pack.html
+++ b/git-verify-pack.html
@@ -315,12 +315,12 @@ corresponding pack file.</p>
 <p>When specifying the -v option the format used is:</p>\r
 <div class="literalblock">\r
 <div class="content">\r
-<pre><tt>SHA1 type size offset-in-packfile</tt></pre>\r
+<pre><tt>SHA1 type size size-in-pack-file offset-in-packfile</tt></pre>\r
 </div></div>\r
 <p>for objects that are not deltified in the pack, and</p>\r
 <div class="literalblock">\r
 <div class="content">\r
-<pre><tt>SHA1 type size offset-in-packfile depth base-SHA1</tt></pre>\r
+<pre><tt>SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1</tt></pre>\r
 </div></div>\r
 <p>for objects that are deltified.</p>\r
 </div>\r
@@ -338,7 +338,7 @@ corresponding pack file.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:58 UTC\r
+Last updated 03-Mar-2008 02:00:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-verify-pack.txt b/git-verify-pack.txt
index db019a2b8d1bb283789726bf47ee0f7b9e4a523e..ba2a157299566b4dcc88f8ecb6f0eaed755f95bb 100644 (file)
--- a/git-verify-pack.txt
+++ b/git-verify-pack.txt
@@ -32,11 +32,11 @@ OUTPUT FORMAT
 -------------
 When specifying the -v option the format used is:
 
-       SHA1 type size offset-in-packfile
+       SHA1 type size size-in-pack-file offset-in-packfile
 
 for objects that are not deltified in the pack, and
 
-       SHA1 type size offset-in-packfile depth base-SHA1
+       SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1
 
 for objects that are deltified.
 

diff --git a/rev-list-options.txt b/rev-list-options.txt
index 259072c07883cf15db4162737a63a6506b7443b4..2648a550850bf07128e4a0a14c82860d6bad17b8 100644 (file)
--- a/rev-list-options.txt
+++ b/rev-list-options.txt
@@ -130,9 +130,11 @@ limiting may be applied.
 
        Show commits older than a specific date.
 
+ifdef::git-rev-list[]
 --max-age='timestamp', --min-age='timestamp'::
 
        Limit the commits output to specified time range.
+endif::git-rev-list[]
 
 --author='pattern', --committer='pattern'::
 

diff --git a/technical/api-run-command.html b/technical/api-run-command.html
index 98ecb6a4e11cc784fabbd3bb52b0166f39fd1c64..67e1b63ec3ef33c5d74fb0511d18127f877bb3a7 100644 (file)
--- a/technical/api-run-command.html
+++ b/technical/api-run-command.html
@@ -333,7 +333,7 @@ produces in the caller in order to process it.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Wait for the completeion of an asynchronous function that was\r
+        Wait for the completion of an asynchronous function that was\r
         started with start_async().\r
 </p>\r
 </dd>\r
@@ -465,8 +465,8 @@ If the string is of the form "VAR=value", i.e. it contains <em>=</em>
 </li>\r
 <li>\r
 <p>\r
-If the string does not contain <em>=</em>, it names an environement\r
-  variable that will be removed from the child process's envionment.\r
+If the string does not contain <em>=</em>, it names an environment\r
+  variable that will be removed from the child process's environment.\r
 </p>\r
 </li>\r
 </ol>\r
@@ -563,7 +563,7 @@ It must not change the program's state that the caller of the
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 20-Feb-2008 10:44:10 UTC\r
+Last updated 03-Mar-2008 02:00:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/technical/api-run-command.txt b/technical/api-run-command.txt
index dfbf9ac5d06e32a7961afdd08910df6eccb912c7..fde3b453211030b7256ccedd100970ef712338bd 100644 (file)
--- a/technical/api-run-command.txt
+++ b/technical/api-run-command.txt
@@ -49,7 +49,7 @@ Functions
 
 `finish_async`::
 
-       Wait for the completeion of an asynchronous function that was
+       Wait for the completion of an asynchronous function that was
        started with start_async().
 
 
@@ -121,8 +121,8 @@ string pointers (NULL terminated) in .env:
 . If the string is of the form "VAR=value", i.e. it contains '='
   the variable is added to the child process's environment.
 
-. If the string does not contain '=', it names an environement
-  variable that will be removed from the child process's envionment.
+. If the string does not contain '=', it names an environment
+  variable that will be removed from the child process's environment.
 
 To specify a new initial working directory for the sub-process,
 specify it in the .dir member.