Merge branch 'ar/diff-args-osx-precompose' into maint

diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample
index d84758373da1d3121ec907435ae5d598c5c14b26..80ba94135cc378364af9d3cb2450df48e51faf2c 100755 (executable)
--- a/templates/hooks--update.sample
+++ b/templates/hooks--update.sample
@@ -1,6 +1,6 @@
 #!/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".