Merge branch 'maint'

diff --git a/Documentation/git-receive-pack.txt b/Documentation/git-receive-pack.txt
index 4ef18404722e045bbc0b010545b3a34cac2d6586..2633d94c59361aca594e8396a13205ef0187f636 100644 (file)
--- a/Documentation/git-receive-pack.txt
+++ b/Documentation/git-receive-pack.txt
@@ -78,7 +78,7 @@ The hook should exit with non-zero status if it wants to disallow
 updating the named ref.  Otherwise it should exit with zero.
 
 Successful execution (a zero exit status) of this hook does not
-ensure the ref will actully be updated, it is only a prerequisite.
+ensure the ref will actually be updated, it is only a prerequisite.
 As such it is not a good idea to send notices (e.g. email) from
 this hook.  Consider using the post-receive hook instead.