diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:04:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 23:04:40 -0800 |
| commit | 58f37f3c07ef4869f88c79b61f11829bebf7bf40 (patch) | |
| tree | 7cca538f4e2eb9087c764405fb9f93fdd30d5fa9 /Documentation/githooks.txt | |
| parent | 5c38ea31f345d08f37685cf4f50c599a7af56bcf (diff) | |
| parent | 9d3043cf333ee500e476a558acb234b42e43cc62 (diff) | |
| download | git-58f37f3c07ef4869f88c79b61f11829bebf7bf40.tar.gz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.1.1
builtin-fsck: fix off by one head count
t5540: clarify that http-push does not handle packed-refs on the remote
http-push: when making directories, have a trailing slash in the path name
http-push: fix off-by-path_len
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
Diffstat (limited to 'Documentation/githooks.txt')
| -rw-r--r-- | Documentation/githooks.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index e4d61d5562..1fd512bca2 100644 --- 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 |