summaryrefslogtreecommitdiffstats
path: root/git-commit.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-07-27 07:26:40 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-07-27 07:26:40 +0000
commitb968dbbd6a939fc1282a7837026e131ed921e122 (patch)
treeea2c6e3bfaa630641b319f06d7519955eaaebacb /git-commit.html
parent6936156b92bf31acd8e14b74ddf5b83a59de50f6 (diff)
downloadgit-htmldocs-b968dbbd6a939fc1282a7837026e131ed921e122.tar.gz
Autogenerated HTML docs for v1.5.3-rc3-13-g7ab3
Diffstat (limited to 'git-commit.html')
-rw-r--r--git-commit.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/git-commit.html b/git-commit.html
index af283396a..500db14ab 100644
--- 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
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. The
- template file may also be specified using the <tt>commit.template</tt>
- configuration variable.
+ the <tt>-m</tt> or <tt>-F</tt> options, this option has no effect. This
+ overrides the <tt>commit.template</tt> configuration variable.
</p>
</dd>
<dt>
@@ -702,7 +701,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 25-Jul-2007 08:53:09 UTC
+Last updated 27-Jul-2007 07:25:18 UTC
</div>
</div>
</body>