Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index f90faf7aaa250b2fea09d611e4efac31968ce6db..1d97a17904f002d57cf90a90d4748664f7ad0db1 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -64,12 +64,6 @@ OPTIONS
 -------
 include::merge-options.txt[]
 
--S[<keyid>]::
---gpg-sign[=<keyid>]::
-       GPG-sign the resulting merge commit. The `keyid` argument is
-       optional and defaults to the committer identity; if specified,
-       it must be stuck to the option without a space.
-
 -m <msg>::
        Set the commit message to be used for the merge commit (in
        case one is created).