Autogenerated HTML docs for v1.7.10-207-g0bb2e

1 files changed, 9 insertions, 6 deletions

diff --git a/git-commit.html b/git-commit.html
index f06df825e..0140b2312 100644
--- a/git-commit.html
+++ b/git-commit.html
@@ -811,11 +811,14 @@ that, you can recover from it with <em>git reset</em>.</p></div>
 </dt>

 <dd>

 <p>

-        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 <tt>-m</tt> or <tt>-F</tt> options, this option has no effect. This

-        overrides the <tt>commit.template</tt> configuration variable.

+        When editing the commit message, start the editor with the

+        contents in the given file.  The <tt>commit.template</tt> configuration

+        variable is often used to give this option implicitly to the

+        command.  This mechanism can be used by projects that want to

+        guide participants with some hints on what to write in the message

+        in what order.  If the user exits the editor without editing the

+        message, the commit is aborted.  This has no effect when a message

+        is given by other means, e.g. with the <tt>-m</tt> or <tt>-F</tt> options.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1304,7 +1307,7 @@ information.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2011-11-15 13:45:02 PDT

+Last updated 2012-04-16 14:18:39 PDT

 </div>

 </div>

 </body>