summaryrefslogtreecommitdiffstats
path: root/githooks.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2009-01-18 18:26:37 +0000
committerJunio C Hamano <junio@hera.kernel.org>2009-01-18 18:26:37 +0000
commitbd53dbff51079dc26ea27b00d94b28a5229c0fec (patch)
treeed0a78743f67e293b2302e91fefa24e6e579c428 /githooks.html
parent4efe0e79bcead21602c1f6669f07d4739358ca1a (diff)
downloadgit-htmldocs-bd53dbff51079dc26ea27b00d94b28a5229c0fec.tar.gz
Autogenerated HTML docs for v1.6.1-203-ga83c8
Diffstat (limited to 'githooks.html')
-rw-r--r--githooks.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/githooks.html b/githooks.html
index 16bd8e188..ee0d64594 100644
--- a/githooks.html
+++ b/githooks.html
@@ -392,7 +392,7 @@ to modify the commit message.</p></div>
<div class="para"><p>This hook is invoked by <em>git-commit</em> right after preparing the
default log message, and before the editor is started.</p></div>
<div class="para"><p>It takes one to three parameters. The first is the name of the file
-that the commit log message. The second is the source of the commit
+that contains the commit log message. The second is the source of the commit
message, and can be: <tt>message</tt> (if a <tt>-m</tt> or <tt>-F</tt> option was
given); <tt>template</tt> (if a <tt>-t</tt> option was given or the
configuration option <tt>commit.template</tt> is set); <tt>merge</tt> (if the
@@ -589,7 +589,7 @@ to abort.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-01-13 16:47:30 UTC
+Last updated 2009-01-18 18:26:22 UTC
</div>
</div>
</body>