Merge branch 'ad/rebase-i-serie-typofix' into maint

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 4e323043017deee83d547e52e7797dd61a02cd5d..2552ab8e8d5104d09c1c95010ab028068c7d18ae 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -42,6 +42,12 @@ set to `no` at the beginning of them.
        current `HEAD` is already up to date or the merge can be
        resolved as a fast-forward.
 
+-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.
+
 --log[=<n>]::
 --no-log::
        In addition to branch names, populate the log message with