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

gitster · gitster · commit 2e1e569d0ef7 · 2016-03-10T11:13:50.000-08:00
* ma/update-hooks-sample-typofix:
  templates/hooks: fix minor typo in the sample update-hook
diff --git 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".

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`#`
`3`		`-# An example hook script to blocks unannotated tags from entering.`
	`3`	`+# An example hook script to block unannotated tags from entering.`
`4`	`4`	`# Called by "git receive-pack" with arguments: refname sha1-old sha1-new`
`5`	`5`	`#`
`6`	`6`	`# To enable this hook, rename this file to "update".`