Autogenerated HTML docs for v1.5.3-rc3-13-g7ab3

diff --git a/config.txt b/config.txt
index dd98d95d9748cdcb4fd0926a049b4a68dad47a73..3135cb7a66814a5764891641f300be07681c551e 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -393,6 +393,9 @@ color.status.<slot>::
        or `untracked` (files which are not tracked by git). The values of
        these variables may be specified as in color.branch.<slot>.
 
+commit.template::
+       Specify a file to use as the template for new commit messages.
+
 diff.renameLimit::
        The number of files to consider when performing the copy/rename
        detection; equivalent to the git diff option '-l'.

diff --git a/diff-options.txt b/diff-options.txt
index 82165763ba138e587a59d5b5cea03e3b7a9af072..228ccaf10ab6bf7e4a3909d31ac31afbd2361d8c 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -43,7 +43,9 @@
        Synonym for "-p --stat".
 
 -z::
-       \0 line termination on output
+       NUL-line termination on output.  This affects the --raw
+       output field terminator.  Also output from commands such
+       as "git-log" will be delimited with NUL between commits.
 
 --name-only::
        Show only names of changed files.

diff --git a/git-commit.html b/git-commit.html
index af283396a281dd0b37015750654f4b4b52df1e02..500db14ab6d5cb3be6cd099ed0cd1d75d6cf173b 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -387,9 +387,8 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
         Use the contents of the given file as the initial version\r
         of the commit message. The editor is invoked and you can\r
         make subsequent changes. If a message is specified using\r
-        the <tt>-m</tt> or <tt>-F</tt> options, this option has no effect. The\r
-        template file may also be specified using the <tt>commit.template</tt>\r
-        configuration variable.\r
+        the <tt>-m</tt> or <tt>-F</tt> options, this option has no effect. This\r
+        overrides the <tt>commit.template</tt> configuration variable.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -702,7 +701,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Jul-2007 08:53:09 UTC\r
+Last updated 27-Jul-2007 07:25:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index 3f36c6782fff2993d83fb2134234f263b0f33120..627994eb9727379183c40dde786b80c53d3e2af3 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -78,9 +78,8 @@ OPTIONS
        Use the contents of the given file as the initial version
        of the commit message. The editor is invoked and you can
        make subsequent changes. If a message is specified using
-       the `-m` or `-F` options, this option has no effect. The
-       template file may also be specified using the `commit.template`
-       configuration variable.
+       the `-m` or `-F` options, this option has no effect. This
+       overrides the `commit.template` configuration variable.
 
 -s|--signoff::
        Add Signed-off-by line at the end of the commit message.

diff --git a/git-config.html b/git-config.html
index 078501e9b0b86d787bc175fcba935d5b6ead1bdc..49295b7deef8819a62a0e4d977d05dc526656877 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1200,6 +1200,14 @@ color.status.<slot>
 </p>\r
 </dd>\r
 <dt>\r
+commit.template\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specify a file to use as the template for new commit messages.\r
+</p>\r
+</dd>\r
+<dt>\r
 diff.renameLimit\r
 </dt>\r
 <dd>\r
@@ -1864,7 +1872,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 22-Jul-2007 09:33:18 UTC\r
+Last updated 27-Jul-2007 07:25:18 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.html b/git-diff-files.html
index c5e961c0bb097eda88c37f657813345443f71a62..f80a5a23183a771aae74ef2d444bc108b47472ee 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -388,7 +388,9 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </dt>\r
 <dd>\r
 <p>\r
-        \0 line termination on output\r
+        NUL-line termination on output.  This affects the --raw\r
+        output field terminator.  Also output from commands such\r
+        as "git-log" will be delimited with NUL between commits.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1111,7 +1113,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Jul-2007 02:14:01 UTC\r
+Last updated 27-Jul-2007 07:25:20 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index 4f858471dccb452b34c4f8d4333c3b4f0a883ac9..9d6dc39e6704ffb60b835d5b15c591dee46170e1 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -389,7 +389,9 @@ entries in the index are compared.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        \0 line termination on output\r
+        NUL-line termination on output.  This affects the --raw\r
+        output field terminator.  Also output from commands such\r
+        as "git-log" will be delimited with NUL between commits.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1193,7 +1195,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Jul-2007 02:14:01 UTC\r
+Last updated 27-Jul-2007 07:25:22 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index afeeab55c9ef136854faf861caa22037530f7fac..b45da36557af286cd2dd6a19aecb12f535a07ecf 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -391,7 +391,9 @@ git-diff-tree(1) Manual Page
 </dt>\r
 <dd>\r
 <p>\r
-        \0 line termination on output\r
+        NUL-line termination on output.  This affects the --raw\r
+        output field terminator.  Also output from commands such\r
+        as "git-log" will be delimited with NUL between commits.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -1581,7 +1583,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Jul-2007 02:14:03 UTC\r
+Last updated 27-Jul-2007 07:25:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 0fb9d85f3b79576ae88ab741d19219185c2f5af5..8dc5c68adb19968e5eed5a1099a45e1becdef413 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -443,7 +443,9 @@ any &lt;tree-ish&gt;.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        \0 line termination on output\r
+        NUL-line termination on output.  This affects the --raw\r
+        output field terminator.  Also output from commands such\r
+        as "git-log" will be delimited with NUL between commits.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -896,7 +898,7 @@ output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Jul-2007 02:14:04 UTC\r
+Last updated 27-Jul-2007 07:25:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.html b/git-format-patch.html
index ac39fd689ca2677b430482b60e929128a6dd5e89..eb04f9013642d13d4085cc48fdb92e3ae24e46da 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -414,7 +414,9 @@ reference.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        \0 line termination on output\r
+        NUL-line termination on output.  This affects the --raw\r
+        output field terminator.  Also output from commands such\r
+        as "git-log" will be delimited with NUL between commits.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -947,7 +949,7 @@ git-format-patch -3
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 26-Jul-2007 02:14:06 UTC\r
+Last updated 27-Jul-2007 07:25:26 UTC\r
 </div>\r
 </div>\r
 </body>\r