Merge branch 'jn/am-doc-hooks'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 17924d0f3ff3cf525b5ab93b50020929d6ea24c0..a2b97582fe010ffcab70db30e006a7a94d6b767b 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -193,6 +193,11 @@ commits, like running 'git am' on the wrong branch or an error in the
 commits that is more easily fixed by changing the mailbox (e.g.
 errors in the "From:" lines).
 
+HOOKS
+-----
+This command can run `applypatch-msg`, `pre-applypatch`,
+and `post-applypatch` hooks.  See linkgit:githooks[5] for more
+information.
 
 SEE ALSO
 --------