summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-14 21:26:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-14 21:26:27 (GMT)
commit85ff22e68be43254dc6a39ae243c056959f0686e (patch)
tree16d6ca4a5f6c797a667ee69bede1ffc79b0f09bd
parent430e4761ce2f95151ccf46f0ec3d5081e9475730 (diff)
parent0e3d40c60d9ae14ddc9f525ce4db3cbc0bde5278 (diff)
downloadgit-85ff22e68be43254dc6a39ae243c056959f0686e.zip
git-85ff22e68be43254dc6a39ae243c056959f0686e.tar.gz
git-85ff22e68be43254dc6a39ae243c056959f0686e.tar.bz2
Merge branch 'jn/am-doc-hooks'
* jn/am-doc-hooks: am doc: add a pointer to relevant hooks
-rw-r--r--Documentation/git-am.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 17924d0..a2b9758 100644
--- 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
--------