Autogenerated HTML docs for v1.5.3.5-561-g140d

diff --git a/RelNotes-1.5.3.5.txt b/RelNotes-1.5.3.5.txt
index 4e46d2c2a27cecee0d87461ad08b31cea5dfec2e..f99a2cd65003c06ef5da26a4508b4ce74d6b267f 100644 (file)
--- a/RelNotes-1.5.3.5.txt
+++ b/RelNotes-1.5.3.5.txt
@@ -63,8 +63,8 @@ Fixes since v1.5.3.4
 
  * Git segfaulted when reading an invalid .gitattributes file.  Fixed.
 
- * post-receive-email example hook fixed was fixed for
-   non-fast-forward updates.
+ * post-receive-email example hook was fixed for non-fast-forward
+   updates.
 
  * Documentation updates for supported (but previously undocumented)
    options of "git-archive" and "git-reflog".

diff --git a/config.txt b/config.txt
index edf50cd2113e73daa0a05c16a416424441f010f3..0df004ea261d6862db0a9b528ec7f2c11bdd5b65 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -661,6 +661,15 @@ pack.threads::
        machines. The required amount of memory for the delta search window
        is however multiplied by the number of threads.
 
+pack.indexVersion::
+       Specify the default pack index version.  Valid values are 1 for
+       legacy pack index used by Git versions prior to 1.5.2, and 2 for
+       the new pack index with capabilities for packs larger than 4 GB
+       as well as proper protection against the repacking of corrupted
+       packs.  Version 2 is selected and this config option ignored
+       whenever the corresponding pack is larger than 2 GB.  Otherwise
+       the default is 1.
+
 pull.octopus::
        The default merge strategy to use when pulling multiple branches
        at once.

diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 3e510498ef505bba9c23cd0d427dafc218ab0d9e..1aee1b041ff873e2ace7593a32c77f9eaba454db 100644 (file)
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -272,7 +272,7 @@ git-cherry-pick(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-cherry-pick</em> [--edit] [-n] [-x] &lt;commit&gt;</p>\r
+<p><em>git-cherry-pick</em> [--edit] [-n] [-m parent-number] [-x] &lt;commit&gt;</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -331,6 +331,18 @@ modifications from the HEAD commit).</p>
 </p>\r
 </dd>\r
 <dt>\r
+-m parent-number|--mainline parent-number\r
+</dt>\r
+<dd>\r
+<p>\r
+        Usually you cannot revert a merge because you do not know which\r
+        side of the merge should be considered the mainline.  This\r
+        option specifies the parent number (starting from 1) of\r
+        the mainline and allows cherry-pick to replay the change\r
+        relative to the specified parent.\r
+</p>\r
+</dd>\r
+<dt>\r
 -n|--no-commit\r
 </dt>\r
 <dd>\r
@@ -363,7 +375,7 @@ effect to your working tree in a row.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Oct-2007 01:21:45 UTC\r
+Last updated 04-Nov-2007 11:13:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt
index 76a2edfd9b3665b4dbe8e3837c06737e7c5fd232..937c4a79262d44583849fc81319187fa7fb65579 100644 (file)
--- a/git-cherry-pick.txt
+++ b/git-cherry-pick.txt
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
 
 SYNOPSIS
 --------
-'git-cherry-pick' [--edit] [-n] [-x] <commit>
+'git-cherry-pick' [--edit] [-n] [-m parent-number] [-x] <commit>
 
 DESCRIPTION
 -----------
@@ -44,6 +44,13 @@ OPTIONS
        described above, and `-r` was to disable it.  Now the
        default is not to do `-x` so this option is a no-op.
 
+-m parent-number|--mainline parent-number::
+       Usually you cannot revert a merge because you do not know which
+       side of the merge should be considered the mainline.  This
+       option specifies the parent number (starting from 1) of
+       the mainline and allows cherry-pick to replay the change
+       relative to the specified parent.
+
 -n|--no-commit::
        Usually the command automatically creates a commit with
        a commit log message stating which commit was

diff --git a/git-clone.html b/git-clone.html
index 5305119f2dbb5fe08fdb55d4044a9676e5f1e59a..2ee6ec290149c1511d6b2e4acd3d56d38a845781 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -276,7 +276,7 @@ git-clone(1) Manual Page
 <div class="content"><em>git-clone</em> [--template=&lt;template_directory&gt;]\r
           [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]\r
           [-o &lt;name&gt;] [-u &lt;upload-pack&gt;] [--reference &lt;repository&gt;]\r
-          [--depth &lt;depth&gt;] &lt;repository&gt; [&lt;directory&gt;]</div></div>\r
+          [--depth &lt;depth&gt;] [--] &lt;repository&gt; [&lt;directory&gt;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\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 02-Nov-2007 02:47:20 UTC\r
+Last updated 04-Nov-2007 11:13:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.txt b/git-clone.txt
index cca14d6b5df042fcf48889e5ff00285ffc4c3009..14e58f3866e3a4e7d1da01753cb68082e88ae2f6 100644 (file)
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 'git-clone' [--template=<template_directory>]
          [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare]
          [-o <name>] [-u <upload-pack>] [--reference <repository>]
-         [--depth <depth>] <repository> [<directory>]
+         [--depth <depth>] [--] <repository> [<directory>]
 
 DESCRIPTION
 -----------

diff --git a/git-config.html b/git-config.html
index b57444bf11b7004982ca8fbd2907ce4aebe71cd6..662d724538790f7c9c2f542bd54d7beca2d158f8 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1715,6 +1715,20 @@ pack.threads
 </p>\r
 </dd>\r
 <dt>\r
+pack.indexVersion\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specify the default pack index version.  Valid values are 1 for\r
+        legacy pack index used by Git versions prior to 1.5.2, and 2 for\r
+        the new pack index with capabilities for packs larger than 4 GB\r
+        as well as proper protection against the repacking of corrupted\r
+        packs.  Version 2 is selected and this config option ignored\r
+        whenever the corresponding pack is larger than 2 GB.  Otherwise\r
+        the default is 1.\r
+</p>\r
+</dd>\r
+<dt>\r
 pull.octopus\r
 </dt>\r
 <dd>\r
@@ -1942,7 +1956,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Oct-2007 06:49:38 UTC\r
+Last updated 04-Nov-2007 11:13:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-revert.html b/git-revert.html
index 6bd6c71d51c6b7cea4f7b06c1eb910e9897c65e7..56562a375979509c596d0eb75dcf21e1702dc88e 100644 (file)
--- a/git-revert.html
+++ b/git-revert.html
@@ -272,7 +272,7 @@ git-revert(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-revert</em> [--edit | --no-edit] [-n] &lt;commit&gt;</p>\r
+<p><em>git-revert</em> [--edit | --no-edit] [-n] [-m parent-number] &lt;commit&gt;</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -304,6 +304,18 @@ modifications from the HEAD commit).</p>
 </p>\r
 </dd>\r
 <dt>\r
+-m parent-number|--mainline parent-number\r
+</dt>\r
+<dd>\r
+<p>\r
+        Usually you cannot revert a merge because you do not know which\r
+        side of the merge should be considered the mainline.  This\r
+        option specifies the parent number (starting from 1) of\r
+        the mainline and allows revert to reverse the change\r
+        relative to the specified parent.\r
+</p>\r
+</dd>\r
+<dt>\r
 --no-edit\r
 </dt>\r
 <dd>\r
@@ -345,7 +357,7 @@ effect to your working tree in a row.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:53 UTC\r
+Last updated 04-Nov-2007 11:13:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-revert.txt b/git-revert.txt
index 69db4984473fae7928797bcfb13baf1f0e39d851..3457c4078781d15f9b292d807119f28eee46866c 100644 (file)
--- a/git-revert.txt
+++ b/git-revert.txt
@@ -7,7 +7,7 @@ git-revert - Revert an existing commit
 
 SYNOPSIS
 --------
-'git-revert' [--edit | --no-edit] [-n] <commit>
+'git-revert' [--edit | --no-edit] [-n] [-m parent-number] <commit>
 
 DESCRIPTION
 -----------
@@ -27,6 +27,13 @@ OPTIONS
        message prior committing the revert. This is the default if
        you run the command from a terminal.
 
+-m parent-number|--mainline parent-number::
+       Usually you cannot revert a merge because you do not know which
+       side of the merge should be considered the mainline.  This
+       option specifies the parent number (starting from 1) of
+       the mainline and allows revert to reverse the change
+       relative to the specified parent.
+
 --no-edit::
        With this option, `git-revert` will not start the commit
        message editor.