summaryrefslogtreecommitdiff
path: root/Documentation/git-commit.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-16 17:56:59 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-16 17:56:59 -0800
commit1ae419cb3902e6cc45538a9673539ed5316fcf30 (patch)
treeb347204ec26b40a72b394f75d357c3278d75bab9 /Documentation/git-commit.txt
parentfef1c4c0a0766b83cfacaf6276d7bd0d1aa9a2e4 (diff)
parent8089c85bcba89464b9b2a32fa948ed85eb367e70 (diff)
downloadgit-1ae419cb3902e6cc45538a9673539ed5316fcf30.tar.gz
Merge branch 'pb/prepare-commit-msg'
* pb/prepare-commit-msg: git-commit: add a prepare-commit-msg hook git-commit: Refactor creation of log message. git-commit: set GIT_EDITOR=: if editor will not be launched git-commit: support variable number of hook arguments
Diffstat (limited to 'Documentation/git-commit.txt')
-rw-r--r--Documentation/git-commit.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index c3725b2ed9..b4ae61ff46 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -280,8 +280,8 @@ order).
HOOKS
-----
-This command can run `commit-msg`, `pre-commit`, and
-`post-commit` hooks. See link:hooks.html[hooks] for more
+This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,
+and `post-commit` hooks. See link:hooks.html[hooks] for more
information.