Merge branch 'jk/virtual-objects-do-exist'

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 959044347e5ee0daf78b3503794e2bf3c51f0efb..5bf653c111d07e0958840e38187320a433b20d07 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
 ~~~~~~~~~~~~~~~~~~