Merge branch 'jk/hashcmp-memcmp' into next

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 43f3555075e25def60d5093ac1ad1d20e22a7cc3..623ed1a13829188971531aa62c6e109e9d29ec44 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -121,6 +121,9 @@ 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 removes the
+help message found in the commented portion of the commit template.
+
 commit-msg
 ~~~~~~~~~~