Merge branch 'jk/maint-cvsimport-pathname' into maint

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 79f633e837180c657f9a7867360363e7137496da..06e0f315c3bb5bb6ef3320b8b1922b76480f9646 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -245,7 +245,7 @@ Both standard output and standard error output are forwarded to
 for the user.
 
 The default 'update' hook, when enabled--and with
-`hooks.allowunannotated` config option turned on--prevents
+`hooks.allowunannotated` config option unset or set to false--prevents
 unannotated tags to be pushed.
 
 [[post-receive]]