Autogenerated HTML docs for v1.5.1.1-98-gedb4f

diff --git a/config.txt b/config.txt
index cf1e040381a99ed458dc061fe103e3c2d2c9474c..7e41ca6a0d3e4329d1efc10b4dcb90613975e5bd 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -117,6 +117,16 @@ core.fileMode::
        the working copy are ignored; useful on broken filesystems like FAT.
        See gitlink:git-update-index[1]. True by default.
 
+core.autocrlf::
+       If true, makes git convert `CRLF` at the end of lines in text files to
+       `LF` when reading from the filesystem, and convert in reverse when
+       writing to the filesystem.  The variable can be set to
+       'input', in which case the conversion happens only while
+       reading from the filesystem but files are written out with
+       `LF` at the end of lines.  Currently, which paths to consider
+       "text" (i.e. be subjected to the autocrlf mechanism) is
+       decided purely based on the contents.
+
 core.symlinks::
        If false, symbolic links are checked out as small plain files that
        contain the link text. gitlink:git-update-index[1] and
@@ -401,13 +411,20 @@ gc.rerereunresolved::
        The default is 15 days.  See gitlink:git-rerere[1].
 
 gitcvs.enabled::
-       Whether the cvs pserver interface is enabled for this repository.
+       Whether the cvs server interface is enabled for this repository.
        See gitlink:git-cvsserver[1].
 
 gitcvs.logfile::
-       Path to a log file where the cvs pserver interface well... logs
+       Path to a log file where the cvs server interface well... logs
        various stuff. See gitlink:git-cvsserver[1].
 
+gitcvs.allbinary::
+       If true, all files are sent to the client in mode '-kb'. This
+       causes the client to treat all files as binary files which suppresses
+       any newline munging it otherwise might do. A work-around for the
+       fact that there is no way yet to set single files to mode '-kb'.
+       See gitlink:git-cvsserver[1].
+
 http.sslVerify::
        Whether to verify the SSL certificate when fetching or pushing
        over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
@@ -445,7 +462,7 @@ http.lowSpeedLimit, http.lowSpeedTime::
 
 http.noEPSV::
        A boolean which disables using of EPSV ftp command by curl.
-       This can helpful with some "poor" ftp servers which doesn't
+       This can helpful with some "poor" ftp servers which don't
        support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
        environment variable. Default is false (curl will use EPSV).
 

diff --git a/git-config.html b/git-config.html
index 6e7dda1477cfa2dd3f0786f7af6ae2a883e3fa69..c01792896a290c945f5115e89c5a34a11ccee2e6 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -689,6 +689,21 @@ core.fileMode
 </p>\r
 </dd>\r
 <dt>\r
+core.autocrlf\r
+</dt>\r
+<dd>\r
+<p>\r
+        If true, makes git convert <tt>CRLF</tt> at the end of lines in text files to\r
+        <tt>LF</tt> when reading from the filesystem, and convert in reverse when\r
+        writing to the filesystem.  The variable can be set to\r
+        <em>input</em>, in which case the conversion happens only while\r
+        reading from the filesystem but files are written out with\r
+        <tt>LF</tt> at the end of lines.  Currently, which paths to consider\r
+        "text" (i.e. be subjected to the autocrlf mechanism) is\r
+        decided purely based on the contents.\r
+</p>\r
+</dd>\r
+<dt>\r
 core.symlinks\r
 </dt>\r
 <dd>\r
@@ -1141,7 +1156,7 @@ gitcvs.enabled
 </dt>\r
 <dd>\r
 <p>\r
-        Whether the cvs pserver interface is enabled for this repository.\r
+        Whether the cvs server interface is enabled for this repository.\r
         See <a href="git-cvsserver.html">git-cvsserver(1)</a>.\r
 </p>\r
 </dd>\r
@@ -1150,11 +1165,23 @@ gitcvs.logfile
 </dt>\r
 <dd>\r
 <p>\r
-        Path to a log file where the cvs pserver interface well&#8230; logs\r
+        Path to a log file where the cvs server interface well&#8230; logs\r
         various stuff. See <a href="git-cvsserver.html">git-cvsserver(1)</a>.\r
 </p>\r
 </dd>\r
 <dt>\r
+gitcvs.allbinary\r
+</dt>\r
+<dd>\r
+<p>\r
+        If true, all files are sent to the client in mode <em>-kb</em>. This\r
+        causes the client to treat all files as binary files which suppresses\r
+        any newline munging it otherwise might do. A work-around for the\r
+        fact that there is no way yet to set single files to mode <em>-kb</em>.\r
+        See <a href="git-cvsserver.html">git-cvsserver(1)</a>.\r
+</p>\r
+</dd>\r
+<dt>\r
 http.sslVerify\r
 </dt>\r
 <dd>\r
@@ -1230,7 +1257,7 @@ http.noEPSV
 <dd>\r
 <p>\r
         A boolean which disables using of EPSV ftp command by curl.\r
-        This can helpful with some "poor" ftp servers which doesn't\r
+        This can helpful with some "poor" ftp servers which don't\r
         support EPSV mode. Can be overridden by the <em>GIT_CURL_FTP_NO_EPSV</em>\r
         environment variable. Default is false (curl will use EPSV).\r
 </p>\r
@@ -1539,7 +1566,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:34 UTC\r
+Last updated 14-Apr-2007 16:21:44 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 0b60e0029782672adb6e7be7cbe2fd43b1a26fe9..e3d8b69440cd791612bc4a2b5a7a75387bfe8355 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1024,6 +1024,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%m</em>: left, right or boundary mark\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%n</em>: newline\r
 </p>\r
 <dl>\r
@@ -1463,7 +1468,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:39 UTC\r
+Last updated 14-Apr-2007 16:21:44 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index 4469a889c081449a7835db4687fcf2bb64ef88e3..dcf8cd684d96f4a4429973010ae8c6e80bb81ca9 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -559,6 +559,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%m</em>: left, right or boundary mark\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%n</em>: newline\r
 </p>\r
 <dl>\r
@@ -756,7 +761,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:48 UTC\r
+Last updated 14-Apr-2007 16:21:45 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.html b/git-rev-list.html
index 653d8bc52d210eba2a89b610faf96395aa87978d..68151655d8706bbc6e5759cb385a0e25ab4672bc 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -286,6 +286,7 @@ git-rev-list(1) Manual Page
              [ --topo-order ]\r
              [ --parents ]\r
              [ --left-right ]\r
+             [ --cherry-pick ]\r
              [ --encoding[=<encoding>] ]\r
              [ --(author|committer|grep)=<pattern> ]\r
              [ [--objects | --objects-edge] [ --unpacked ] ]\r
@@ -613,6 +614,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%m</em>: left, right or boundary mark\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%n</em>: newline\r
 </p>\r
 <dl>\r
@@ -842,6 +848,23 @@ limiting may be applied.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--cherry-pick\r
+</dt>\r
+<dd>\r
+<p>\r
+        Omit any commit that introduces the same change as\r
+        another commit on the "other side" when the set of\r
+        commits are limited with symmetric difference.<br />\r
+For example, if you have two branches, <tt>A</tt> and <tt>B</tt>, a usual way\r
+to list all commits on only one side of them is with\r
+<tt>--left-right</tt>, like the example above in the description of\r
+that option.  It however shows the commits that were cherry-picked\r
+from the other branch (for example, "3rd on b" may be cherry-picked\r
+from branch A).  With this option, such pairs of commits are\r
+excluded from the output.\r
+</p>\r
+</dd>\r
+<dt>\r
 -g, --walk-reflogs\r
 </dt>\r
 <dd>\r
@@ -1012,7 +1035,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 06-Apr-2007 00:51:16 UTC\r
+Last updated 14-Apr-2007 16:21:45 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 12b71ed0bbae2516cb67c98c96a56e6278a6f5c2..77e068b15fb02da40a8c4c9f35d076d62f379587 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -22,6 +22,7 @@ SYNOPSIS
             [ \--topo-order ]
             [ \--parents ]
             [ \--left-right ]
+            [ \--cherry-pick ]
             [ \--encoding[=<encoding>] ]
             [ \--(author|committer|grep)=<pattern> ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
@@ -224,6 +225,20 @@ limiting may be applied.
        In addition to the '<commit>' listed on the command
        line, read them from the standard input.
 
+--cherry-pick::
+
+       Omit any commit that introduces the same change as
+       another commit on the "other side" when the set of
+       commits are limited with symmetric difference.
++
+For example, if you have two branches, `A` and `B`, a usual way
+to list all commits on only one side of them is with
+`--left-right`, like the example above in the description of
+that option.  It however shows the commits that were cherry-picked
+from the other branch (for example, "3rd on b" may be cherry-picked
+from branch A).  With this option, such pairs of commits are
+excluded from the output.
+
 -g, --walk-reflogs::
 
        Instead of walking the commit ancestry chain, walk

diff --git a/git-show.html b/git-show.html
index 92a9f40485e09231428511dc05611413b26b038a..89d00eb3bf1b31f67e072a6a8b8c7fa11b85ab8b 100644 (file)
--- a/git-show.html
+++ b/git-show.html
@@ -574,6 +574,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff
 </li>\r
 <li>\r
 <p>\r
+<em>%m</em>: left, right or boundary mark\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
 <em>%n</em>: newline\r
 </p>\r
 <dl>\r
@@ -726,7 +731,7 @@ Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:34:23 UTC\r
+Last updated 14-Apr-2007 16:21:46 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/pretty-formats.txt b/pretty-formats.txt
index 2fe6c319675926afe1609ad7c221dceb42c82310..d7ffc21ddf1e1241d8c485920e6ce56fe38c3f35 100644 (file)
--- a/pretty-formats.txt
+++ b/pretty-formats.txt
@@ -117,6 +117,7 @@ The placeholders are:
 - '%Cgreen': switch color to green
 - '%Cblue': switch color to blue
 - '%Creset': reset color
+- '%m': left, right or boundary mark
 - '%n': newline