Merge branch 'jk/rebase-i-exec-gitdir-fix'

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 4df6431c341a466f2cb9fef094607751b58c008d..3c6927b1fb87940c53ff01339a297d6b85dc1676 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -72,12 +72,6 @@ include::merge-options.txt[]
        agrees to a Developer Certificate of Origin
        (see http://developercertificate.org/ for more information).
 
--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).