Merge branch 'wt/doc-submodule-name-path-confusion-2'

diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index 76bd359394f6df539cdaaa5d59fc694fbe00e120..9adce372ec6e6ec0d371c411da1e5002baea5f51 100644 (file)
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -12,9 +12,9 @@ SYNOPSIS
 'git am' [--signoff] [--keep] [--[no-]keep-cr] [--[no-]utf8]
         [--3way] [--interactive] [--committer-date-is-author-date]
         [--ignore-date] [--ignore-space-change | --ignore-whitespace]
-        [--whitespace=<option>] [-C<n>] [-p<n>] [--patch-format=<format>]
-        [--directory=<dir>] [--exclude=<path>] [--include=<path>]
-        [--reject] [-q | --quiet] [--[no-]scissors]
+        [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
+        [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
+        [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
         [(<mbox> | <Maildir>)...]
 'git am' (--continue | --skip | --abort)
 
@@ -101,7 +101,7 @@ default.   You can use `--no-utf8` to override this.
        By default the command will try to detect the patch format
        automatically. This option allows the user to bypass the automatic
        detection and specify the patch format that the patch(es) should be
-       intepreted as. Valid formats are mbox, stgit, stgit-series and hg.
+       interpreted as. Valid formats are mbox, stgit, stgit-series and hg.
 
 -i::
 --interactive::
@@ -125,6 +125,10 @@ default.   You can use `--no-utf8` to override this.
        Skip the current patch.  This is only meaningful when
        restarting an aborted patch.
 
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+       GPG-sign commits.
+
 --continue::
 -r::
 --resolved::
@@ -195,6 +199,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
 --------