Autogenerated HTML docs for v1.5.3-rc5-46-g23d5

diff --git a/config.txt b/config.txt
index de9e72b562eec6310af23cb4e5ef237268e8df2a..46f40ad4c25edb73bfa34c84cff7b11bf271eb48 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -192,7 +192,7 @@ core.worktree::
        variable and the '--work-tree' command line option.
 
 core.logAllRefUpdates::
-       Updates to a ref <ref> is logged to the file
+       Enable the reflog. Updates to a ref <ref> is logged to the file
        "$GIT_DIR/logs/<ref>", by appending the new and old
        SHA1, the date/time and the reason of the update, but
        only when the file exists.  If this configuration

diff --git a/git-checkout.html b/git-checkout.html
index 928220f77a16012b710e31b672c484f37f13ba41..9a3729b479e2a0e3768cc1c9687144a71261bccc 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -302,7 +302,7 @@ working tree.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Quiet, supress feedback messages.\r
+        Quiet, suppress feedback messages.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -538,7 +538,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jul-2007 02:09:33 UTC\r
+Last updated 21-Aug-2007 02:20:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.txt b/git-checkout.txt
index 818b720b914fa33d3a4b5c7858573bd59f0b0945..734928bf96c35fbe3f66c6693415e0a0d05f9412 100644 (file)
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -35,7 +35,7 @@ working tree.
 OPTIONS
 -------
 -q::
-       Quiet, supress feedback messages.
+       Quiet, suppress feedback messages.
 
 -f::
        Proceed even if the index or the working tree differs

diff --git a/git-config.html b/git-config.html
index 6cd648711495c619cdd8013a5fd3037e4c4c1952..2c95d21de7c4627ed788ab8beb0e65a304035662 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -895,7 +895,7 @@ core.logAllRefUpdates
 </dt>\r
 <dd>\r
 <p>\r
-        Updates to a ref &lt;ref&gt; is logged to the file\r
+        Enable the reflog. Updates to a ref &lt;ref&gt; is logged to the file\r
         "$GIT_DIR/logs/&lt;ref&gt;", by appending the new and old\r
         SHA1, the date/time and the reason of the update, but\r
         only when the file exists.  If this configuration\r
@@ -1883,7 +1883,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Aug-2007 00:27:12 UTC\r
+Last updated 21-Aug-2007 02:20:17 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.html b/git-log.html
index 3bce1def0f3b94f458116dfd206121ead78c4158..9b49154bafeb02fbba6e302724ffaac65b7dd636 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -368,6 +368,7 @@ people using 80-column terminals.</p>
 <p>\r
         Show commits as they were recorded in the reflog. The log contains\r
         a record about how the tip of a reference was changed.\r
+        Cannot be combined with --reverse.\r
         See also <a href="git-reflog.html">git-reflog(1)</a>.\r
 </p>\r
 </dd>\r
@@ -852,7 +853,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Aug-2007 09:42:24 UTC\r
+Last updated 21-Aug-2007 02:20:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-log.txt b/git-log.txt
index 5a90f65b5e9d9ce21bcd0c936a01ded5065d5868..1e6dbd93b1939bb3ce01f5873a433f981aa1f236 100644 (file)
--- a/git-log.txt
+++ b/git-log.txt
@@ -49,6 +49,7 @@ include::pretty-options.txt[]
 -g, \--walk-reflogs::
        Show commits as they were recorded in the reflog. The log contains
        a record about how the tip of a reference was changed.
+       Cannot be combined with --reverse.
        See also gitlink:git-reflog[1].
 
 --decorate::

diff --git a/git-rev-list.html b/git-rev-list.html
index e8c44d1380141aaa24a4328ed3e80504cb090fc1..cef5df943f12f450398c1159ae60796d8cd6b215 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -679,7 +679,8 @@ this causes the output to have two extra lines of information
 taken from the reflog.  By default, <em>commit@{Nth}</em> notation is\r
 used in the output.  When the starting commit is specified as\r
 instead.  Under <em>--pretty=oneline</em>, the commit message is\r
-prefixed with this information on the same line.\r
+prefixed with this information on the same line.<br />\r
+Cannot be combined with --reverse.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -781,6 +782,7 @@ we are bisecting right now to <tt>bisect_all</tt>.
 <dd>\r
 <p>\r
         Output the commits in reverse order.\r
+        Cannot be combined with --walk-reflogs.\r
 </p>\r
 </dd>\r
 </dl>\r
@@ -1142,7 +1144,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 25-Jul-2007 08:53:10 UTC\r
+Last updated 21-Aug-2007 02:20:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 1c1978140f68a5e21dec6ea8d6715b58666f8b7c..cbbc2345491841bc04f9d4dbffc61d1a896b3a48 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -298,6 +298,8 @@ used in the output.  When the starting commit is specified as
 'commit@{now}', output also uses 'commit@\{timestamp}' notation
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.
++
+Cannot be combined with --reverse.
 
 --merge::
 
@@ -373,6 +375,7 @@ By default, the commits are shown in reverse chronological order.
 --reverse::
 
        Output the commits in reverse order.
+       Cannot be combined with --walk-reflogs.
 
 Object Traversal
 ~~~~~~~~~~~~~~~~

diff --git a/git-rev-parse.html b/git-rev-parse.html
index 6f45c66d6fe2ada33e805f560c9dfd256af437a8..72c4d4b60225de381d5ede74401d97747533e5b6 100644 (file)
--- a/git-rev-parse.html
+++ b/git-rev-parse.html
@@ -650,7 +650,10 @@ A suffix <em>:</em> followed by a path; this names the blob or tree
 A colon, optionally followed by a stage number (0 to 3) and a\r
   colon, followed by a path; this names a blob object in the\r
   index at the given path.  Missing stage number (and the colon\r
-  that follows it) names an stage 0 entry.\r
+  that follows it) names an stage 0 entry. During a merge, stage\r
+  1 is the common ancestor, stage 2 is the target branch's version\r
+  (typically the current branch), and stage 3 is the version from\r
+  the branch being merged.\r
 </p>\r
 </li>\r
 </ul>\r
@@ -735,7 +738,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Aug-2007 09:49:28 UTC\r
+Last updated 21-Aug-2007 02:20:19 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index 4b4d229e60150a4f4e5c734a06e220ac263aa8f2..4758c33dee53b21c0e8a489f0da11a30c63cbf48 100644 (file)
--- a/git-rev-parse.txt
+++ b/git-rev-parse.txt
@@ -215,7 +215,10 @@ blobs contained in a commit.
 * A colon, optionally followed by a stage number (0 to 3) and a
   colon, followed by a path; this names a blob object in the
   index at the given path.  Missing stage number (and the colon
-  that follows it) names an stage 0 entry.
+  that follows it) names an stage 0 entry. During a merge, stage
+  1 is the common ancestor, stage 2 is the target branch's version
+  (typically the current branch), and stage 3 is the version from
+  the branch being merged.
 
 Here is an illustration, by Jon Loeliger.  Both node B and C are
 a commit parents of commit node A.  Parent commits are ordered

diff --git a/git-send-email.html b/git-send-email.html
index b497018041d8a5db96d8844b3f74020411f405b7..21e09fdfcb977341e386b4c2e9d8bfaa6819b7a1 100644 (file)
--- a/git-send-email.html
+++ b/git-send-email.html
@@ -401,7 +401,7 @@ enabled interface to provide the necessary information.</p>
         If this is set, do not add the From: address to the cc: list, if it\r
         shows up in a From: line.\r
         Default is the value of <em>sendemail.suppressfrom</em> configuration value;\r
-        if that is unspecified, default to --no-supress-from.\r
+        if that is unspecified, default to --no-suppress-from.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -512,7 +512,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Aug-2007 07:20:23 UTC\r
+Last updated 21-Aug-2007 02:20:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-send-email.txt b/git-send-email.txt
index 08a023ea9262f2c1b4915fd5dcd09a29e1e4f6ab..8231286e09eb462d86679569f6911767b00deaf4 100644 (file)
--- a/git-send-email.txt
+++ b/git-send-email.txt
@@ -88,7 +88,7 @@ The --cc option must be repeated for each user you want on the cc list.
         If this is set, do not add the From: address to the cc: list, if it
         shows up in a From: line.
         Default is the value of 'sendemail.suppressfrom' configuration value;
-        if that is unspecified, default to --no-supress-from.
+        if that is unspecified, default to --no-suppress-from.
 
 --thread, --no-thread::
        If this is set, the In-Reply-To header will be set on each email sent.

diff --git a/git.html b/git.html
index 421eae775f509e3bdef98221f0b243c26563fa02..ee4f45d2b27e7836b045c89c44d7ba57f10960fe 100644 (file)
--- a/git.html
+++ b/git.html
@@ -273,7 +273,8 @@ git(7) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git</em> [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate]\r
+<div class="content"><em>git</em> [--version] [--exec-path[=GIT_EXEC_PATH]]\r
+    [-p|--paginate|--no-pager]\r
     [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]\r
     [--help] COMMAND [ARGS]</div></div>\r
 </div>\r
@@ -336,6 +337,14 @@ documentation can be viewed at
 </p>\r
 </dd>\r
 <dt>\r
+--no-pager\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do not pipe git output into a pager.\r
+</p>\r
+</dd>\r
+<dt>\r
 --git-dir=&lt;path&gt;\r
 </dt>\r
 <dd>\r
@@ -2429,7 +2438,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Aug-2007 04:58:55 UTC\r
+Last updated 21-Aug-2007 02:20:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 8017997fb9bd38a0c497bf233a8f0908b33f8329..3b0d530257c66a5562ced91cc506e49d4ff484d3 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -9,7 +9,8 @@ git - the stupid content tracker
 SYNOPSIS
 --------
 [verse]
-'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate]
+'git' [--version] [--exec-path[=GIT_EXEC_PATH]]
+    [-p|--paginate|--no-pager]
     [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
     [--help] COMMAND [ARGS]
 
@@ -103,6 +104,9 @@ OPTIONS
 -p|--paginate::
        Pipe all output into 'less' (or if set, $PAGER).
 
+--no-pager::
+       Do not pipe git output into a pager.
+
 --git-dir=<path>::
        Set the path to the repository. This can also be controlled by
        setting the GIT_DIR environment variable.