Autogenerated HTML docs for v1.5.3-rc1-4-gaf83

diff --git a/config.txt b/config.txt
index 11b332117c7abbdf3c4239843672d394578f8f0a..d0e9a175f4c967f03462e92a0357165ddfb45473 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -567,6 +567,7 @@ merge.verbosity::
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
+       Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
 
 merge.<driver>.name::
        Defines a human readable name for a custom low-level

diff --git a/git-clone.html b/git-clone.html
index 4c1dcde1da79d7012d16561ca25ad26c49c343e8..e243475d70e1c3f3490e1eec267daa1972423969 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -352,6 +352,9 @@ configuration variables.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--no-checkout\r
+</dt>\r
+<dt>\r
 -n\r
 </dt>\r
 <dd>\r
@@ -608,7 +611,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 06-Jul-2007 17:01:29 UTC\r
+Last updated 13-Jul-2007 05:31:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-clone.txt b/git-clone.txt
index 2f39864b8e0637f94ccd6104c7651de110a5fe4f..a0a10e3e26830d59cbb6eaddaab60a83fa601aa9 100644 (file)
--- a/git-clone.txt
+++ b/git-clone.txt
@@ -64,6 +64,7 @@ OPTIONS
        Operate quietly.  This flag is passed to "rsync" and
        "git-fetch-pack" commands when given.
 
+--no-checkout::
 -n::
        No checkout of HEAD is performed after the clone is complete.
 

diff --git a/git-commit.html b/git-commit.html
index 7c1b54e075531eb3f706ce525461942993c8aeb9..d5303b9f8d2d53b3064dccfc4233761ffdde2e28 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -273,7 +273,7 @@ git-commit(1) Manual Page
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
 <div class="verseblock">\r
-<div class="content"><em>git-commit</em> [-a | --interactive] [-s] [-v]\r
+<div class="content"><em>git-commit</em> [-a | --interactive] [-s] [-v] [-u]\r
            [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt; | --amend]\r
            [--no-verify] [-e] [--author &lt;author&gt;]\r
            [--] [[-i | -o ]&lt;file&gt;&#8230;]</div></div>\r
@@ -372,7 +372,7 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
 </p>\r
 </dd>\r
 <dt>\r
--m &lt;msg&gt;\r
+-m &lt;msg&gt;|--message=&lt;msg&gt;\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -443,6 +443,29 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
 </p>\r
 </dd>\r
 <dt>\r
+-u|--untracked-files\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show all untracked files, also those in uninteresting\r
+        directories, in the "Untracked files:" section of commit\r
+        message template.  Without this option only its name and\r
+        a trailing slash are displayed for each untracked\r
+        directory.\r
+</p>\r
+</dd>\r
+<dt>\r
+-v|--verbose\r
+</dt>\r
+<dd>\r
+<p>\r
+        Show unified diff between the HEAD commit and what\r
+        would be committed at the bottom of the commit message\r
+        template.  Note that this diff output doesn't have its\r
+        lines prefixed with <em>#</em>.\r
+</p>\r
+</dd>\r
+<dt>\r
 -q|--quiet\r
 </dt>\r
 <dd>\r
@@ -664,7 +687,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 16-Jun-2007 09:48:58 UTC\r
+Last updated 13-Jul-2007 05:31:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index 53a7bb0895036e4d66086b8c656e74588c82c38c..f96142f96a733c9cd71ecffd3325bbb168a8ef38 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -8,7 +8,7 @@ git-commit - Record changes to the repository
 SYNOPSIS
 --------
 [verse]
-'git-commit' [-a | --interactive] [-s] [-v]
+'git-commit' [-a | --interactive] [-s] [-v] [-u]
           [(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
           [--no-verify] [-e] [--author <author>]
           [--] [[-i | -o ]<file>...]
@@ -71,7 +71,7 @@ OPTIONS
        Override the author name used in the commit.  Use
        `A U Thor <author@example.com>` format.
 
--m <msg>::
+-m <msg>|--message=<msg>::
        Use the given <msg> as the commit message.
 
 -s|--signoff::
@@ -115,6 +115,19 @@ but can be used to amend a merge commit.
        as well.  This is usually not what you want unless you
        are concluding a conflicted merge.
 
+-u|--untracked-files::
+       Show all untracked files, also those in uninteresting
+       directories, in the "Untracked files:" section of commit
+       message template.  Without this option only its name and
+       a trailing slash are displayed for each untracked
+       directory.
+
+-v|--verbose::
+       Show unified diff between the HEAD commit and what
+       would be committed at the bottom of the commit message
+       template.  Note that this diff output doesn't have its
+       lines prefixed with '#'.
+
 -q|--quiet::
        Suppress commit summary message.
 

diff --git a/git-config.html b/git-config.html
index cd9c454958a0fba64c6c82a1f59fd86a2294228a..3dc4d8754c1dd54dcebb63b5c5b4c7e279503d13 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1528,6 +1528,7 @@ merge.verbosity
         message if conflicts were detected. Level 1 outputs only\r
         conflicts, 2 outputs conflicts and file changes.  Level 5 and\r
         above outputs debugging information.  The default is level 2.\r
+        Can be overriden by <em>GIT_MERGE_VERBOSITY</em> environment variable.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1850,7 +1851,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 13-Jul-2007 00:24:26 UTC\r
+Last updated 13-Jul-2007 05:31:57 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.html b/git-merge.html
index 9f4fa0b0a335c79385c3b1348fbcdc0655dd87f4..d42cf1676bad917a87b952ca5af6c7b4c9863716 100644 (file)
--- a/git-merge.html
+++ b/git-merge.html
@@ -429,6 +429,33 @@ ours
 would want to start over, you can recover with\r
 <a href="git-reset.html">git-reset(1)</a>.</p>\r
 </div>\r
+<h2>CONFIGURATION</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+merge.summary\r
+</dt>\r
+<dd>\r
+<p>\r
+        Whether to include summaries of merged commits in newly\r
+        created merge commit. False by default.\r
+</p>\r
+</dd>\r
+<dt>\r
+merge.verbosity\r
+</dt>\r
+<dd>\r
+<p>\r
+        Controls the amount of output shown by the recursive merge\r
+        strategy.  Level 0 outputs nothing except a final error\r
+        message if conflicts were detected. Level 1 outputs only\r
+        conflicts, 2 outputs conflicts and file changes.  Level 5 and\r
+        above outputs debugging information.  The default is level 2.\r
+        Can be overriden by <em>GIT_MERGE_VERBOSITY</em> environment variable.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
 <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
@@ -579,7 +606,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 16-Jun-2007 09:49:12 UTC\r
+Last updated 13-Jul-2007 05:31:58 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-merge.txt b/git-merge.txt
index d285cba033325f8652996ea71a06d53c22424dae..2c9db98a3cfa616c09dcfd340dcd022aeb7c91e0 100644 (file)
--- a/git-merge.txt
+++ b/git-merge.txt
@@ -43,6 +43,21 @@ If you tried a merge which resulted in a complex conflicts and
 would want to start over, you can recover with
 gitlink:git-reset[1].
 
+CONFIGURATION
+-------------
+
+merge.summary::
+       Whether to include summaries of merged commits in newly
+       created merge commit. False by default.
+
+merge.verbosity::
+       Controls the amount of output shown by the recursive merge
+       strategy.  Level 0 outputs nothing except a final error
+       message if conflicts were detected. Level 1 outputs only
+       conflicts, 2 outputs conflicts and file changes.  Level 5 and
+       above outputs debugging information.  The default is level 2.
+       Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+
 
 HOW MERGE WORKS
 ---------------

diff --git a/git.html b/git.html
index 12d19397b513bd8771c4ed95bd30c0607b59fdc0..210a6ae9e63052dc6519ec0a5c979afd32c8fdab 100644 (file)
--- a/git.html
+++ b/git.html
@@ -1799,6 +1799,16 @@ parameter, &lt;path&gt;.</p>
 <h3>other</h3>\r
 <dl>\r
 <dt>\r
+<em>GIT_MERGE_VERBOSITY</em>\r
+</dt>\r
+<dd>\r
+<p>\r
+        A number controlling the amount of output shown by\r
+        the recursive merge strategy.  Overrides merge.verbosity.\r
+        See <a href="git-merge.html">git-merge(1)</a>\r
+</p>\r
+</dd>\r
+<dt>\r
 <em>GIT_PAGER</em>\r
 </dt>\r
 <dd>\r
@@ -2398,7 +2408,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 13-Jul-2007 00:24:28 UTC\r
+Last updated 13-Jul-2007 05:32:01 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git.txt b/git.txt
index 33614ec0502dcbbadb2f067398e8b02af7cec77f..3fbfd45ffedfafc7b4de718e9455e7555aabdbb8 100644 (file)
--- a/git.txt
+++ b/git.txt
@@ -411,6 +411,11 @@ parameter, <path>.
 
 other
 ~~~~~
+'GIT_MERGE_VERBOSITY'::
+       A number controlling the amount of output shown by
+       the recursive merge strategy.  Overrides merge.verbosity.
+       See gitlink:git-merge[1]
+
 'GIT_PAGER'::
        This environment variable overrides `$PAGER`.