Merge branch 'maint-1.6.0' into maint

[git.git] / Documentation / githooks.txt

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index cfdae1efa2d446e76218df7a2586a26789a151f6..28a8abcf52b0c4180a132d4093b6b8a59c63c6fd 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/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