Merge branch 'ma/update-hooks-sample-typofix' into maint

* ma/update-hooks-sample-typofix:
  templates/hooks: fix minor typo in the sample update-hook

templates/hooks--update.sample

 #!/bin/sh
 #
-# An example hook script to blocks unannotated tags from entering.
+# An example hook script to block unannotated tags from entering.
 # Called by "git receive-pack" with arguments: refname sha1-old sha1-new
 #
 # To enable this hook, rename this file to "update".