Merge branch 'wk/merge-options-gpg-sign-doc'

Doc updates.

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

diff --cc Documentation/git-merge.txt
index 4df6431,1d97a17..3c6927b
--- 1/Documentation/git-merge.txt
--- 2/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -64,20 -64,6 +64,14 @@@ OPTION
  -------
  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.
- 
 +--signoff::
 +      Add Signed-off-by line by the committer at the end of the commit
 +      log message.  The meaning of a signoff depends on the project,
 +      but it typically certifies that committer has
 +      the rights to submit this work under the same license and
 +      agrees to a Developer Certificate of Origin
 +      (see http://developercertificate.org/ for more information).
 +
  -m <msg>::
        Set the commit message to be used for the merge commit (in
        case one is created).

diff --cc Documentation/merge-options.txt
index 4e32304,6d85a76..2552ab8
--- 1/Documentation/merge-options.txt
--- 2/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -39,9 -39,15 +39,15 @@@ set to `no` at the beginning of them
  
  --ff-only::
        Refuse to merge and exit with a non-zero status unless the
 -      current `HEAD` is already up-to-date or the merge can be
 +      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