diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-22 11:32:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-22 11:32:37 -0700 |
| commit | 4b2a6c149b267a1120f1444a0951af13d7b36d69 (patch) | |
| tree | 5c68e72eebbfb448458790b8350ba417b3d93654 /githooks.txt | |
| parent | 65314ca2cdc18a564335d61f615f5f6da04c0f97 (diff) | |
| download | git-htmldocs-4b2a6c149b267a1120f1444a0951af13d7b36d69.tar.gz | |
Autogenerated HTML docs for v2.14.1-248-gf0294f
Diffstat (limited to 'githooks.txt')
| -rw-r--r-- | githooks.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/githooks.txt b/githooks.txt index b2514f4d4..623ed1a13 100644 --- a/githooks.txt +++ b/githooks.txt @@ -121,8 +121,8 @@ it is not suppressed by the `--no-verify` option. A non-zero exit means a failure of the hook and aborts the commit. It should not be used as replacement for pre-commit hook. -The sample `prepare-commit-msg` hook that comes with Git comments -out the `Conflicts:` part of a merge's commit message. +The sample `prepare-commit-msg` hook that comes with Git removes the +help message found in the commented portion of the commit template. commit-msg ~~~~~~~~~~ |