diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-18 06:39:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-18 06:39:49 (GMT) |
| commit | 78f111e12de40e2d9aa8d0774acc287f79862b13 (patch) | |
| tree | 1c7f08c0e2ee31b86a2bfa1c010f5d7bddc3d0fb /Documentation/githooks.txt | |
| parent | 8ee09acd8f3c96683ce2b81bb8ac8079f0e8a4fd (diff) | |
| parent | 3aed2fda6f8233895be0d1142c4c4b407fb692c3 (diff) | |
| download | git-78f111e12de40e2d9aa8d0774acc287f79862b13.zip git-78f111e12de40e2d9aa8d0774acc287f79862b13.tar.gz git-78f111e12de40e2d9aa8d0774acc287f79862b13.tar.bz2 | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
builtin-fsck: fix off by one head count
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 cfdae1e..28a8abc 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 |