Merge branch 'jk/push-simple' into maint

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index d954bf6ba872e31c1197a96487fafd3ad8f73844..9ef2469373a5d7ddc511d9569ed57ca587cc2c6d 100644 (file)
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -175,7 +175,7 @@ if the merge failed due to conflicts.
 
 This hook can be used in conjunction with a corresponding pre-commit hook to
 save and restore any form of metadata associated with the working tree
-(eg: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl
+(e.g.: permissions/ownership, ACLS, etc).  See contrib/hooks/setgitperms.perl
 for an example of how to do this.
 
 pre-push