Merge branch 'jk/unused-params-even-more'

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index bfb0be36599d84c8296ed53ae2da4f591053c63a..786e778ab8223a0ee02a44c8c756652fcf147205 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -99,6 +99,10 @@ All the `git commit` hooks are invoked with the environment
 variable `GIT_EDITOR=:` if the command will not bring up an editor
 to modify the commit message.
 
+The default 'pre-commit' hook, when enabled--and with the
+`hooks.allownonascii` config option unset or set to false--prevents
+the use of non-ASCII filenames.
+
 prepare-commit-msg
 ~~~~~~~~~~~~~~~~~~