summaryrefslogtreecommitdiffstats
path: root/githooks.txt
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.txt
parent4efe0e79bcead21602c1f6669f07d4739358ca1a (diff)
downloadgit-htmldocs-bd53dbff51079dc26ea27b00d94b28a5229c0fec.tar.gz
Autogenerated HTML docs for v1.6.1-203-ga83c8
Diffstat (limited to 'githooks.txt')
-rw-r--r--githooks.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/githooks.txt b/githooks.txt
index e4d61d556..1fd512bca 100644
--- a/githooks.txt
+++ b/githooks.txt
@@ -90,7 +90,7 @@ This hook is invoked by 'git-commit' right after preparing the
default log message, and before the editor is started.
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: `message` (if a `-m` or `-F` option was
given); `template` (if a `-t` option was given or the
configuration option `commit.template` is set); `merge` (if the