aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorStephan Beyer <s-beyer@gmx.net>2009-01-16 21:36:06 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-17 17:57:41 -0800
commit996869601594ffefb67238175055922340ced6f8 (patch)
tree294b93797844321da4513329548ec002ae2ca8f5 /Documentation
parent2454ac7b9fbc12db5cca8cd388422360528d7d6f (diff)
downloadgit-996869601594ffefb67238175055922340ced6f8.tar.gz
git-996869601594ffefb67238175055922340ced6f8.tar.xz
githooks.txt: add missing word
Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/githooks.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 5faaaa5fe..024abb2ff 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -86,7 +86,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