From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2014 21:26:27 +0000 (-0700)
Subject: Merge branch 'jn/am-doc-hooks'
X-Git-Tag: v2.0.0-rc0~118
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/85ff22e68be43254dc6a39ae243c056959f0686e?hp=-c

Merge branch 'jn/am-doc-hooks'

* jn/am-doc-hooks:
am doc: add a pointer to relevant hooks
---

85ff22e68be43254dc6a39ae243c056959f0686e
diff --combined Documentation/git-am.txt
index 17924d0f3f,abcffb64be..a2b97582fe
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@@ -14,7 -14,7 +14,7 @@@ SYNOPSI
  	 [--ignore-date] [--ignore-space-change | --ignore-whitespace]
  	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
  	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 -	 [--[no-]scissors]
 +	 [--[no-]scissors] [-S[<keyid>]]
  	 [(<mbox> | <Maildir>)...]
  'git am' (--continue | --skip | --abort)
  
@@@ -119,10 -119,6 +119,10 @@@ default.   You can use `--no-utf8` to o
  	Skip the current patch.  This is only meaningful when
  	restarting an aborted patch.
  
 +-S[<keyid>]::
 +--gpg-sign[=<keyid>]::
 +	GPG-sign commits.
 +
  --continue::
  -r::
  --resolved::
@@@ -193,6 -189,11 +193,11 @@@ commits, like running 'git am' on the w
  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
  --------