Merge branch 'tj/maint-doc-commit-sign' into maint

* branch 'tj/maint-doc-commit-sign':
Add -S, --gpg-sign option to manpage of "git commit"

diff --combined Documentation/git-commit.txt
index 15cec8601c6953e2526ca8d7ffcbee491885875a,a65d726556af2d512b276576c36c7c2473d4ba02..19cbb9098ff53cd7160d18faf9ac2cd2f56dcb1c
--- 1/Documentation/git-commit.txt
--- 2/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@@ -13,7 -13,7 +13,7 @@@ SYNOPSI
           [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
           [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
           [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
-          [-i | -o] [--] [<file>...]
+          [-i | -o] [-S[<keyid>]] [--] [<file>...]
  
  DESCRIPTION
  -----------
@@@ -184,11 -184,6 +184,11 @@@ OPTION
        commit log message unmodified.  This option lets you
        further edit the message taken from these sources.
  
 +--no-edit::
 +      Use the selected commit message without launching an editor.
 +      For example, `git commit --amend --no-edit` amends a commit
 +      without changing its commit message.
 +
  --amend::
        Used to amend the tip of the current branch. Prepare the tree
        object you would want to replace the latest commit as usual
@@@ -198,6 -193,10 +198,6 @@@
        current tip -- if it was a merge, it will have the parents of
        the current tip as parents -- so the current top commit is
        discarded.
 -
 ---no-post-rewrite::
 -      Bypass the post-rewrite hook.
 -
  +
  --
  It is a rough equivalent for:
@@@ -214,9 -213,6 +214,9 @@@ You should understand the implications 
  amend a commit that has already been published.  (See the "RECOVERING
  FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
  
 +--no-post-rewrite::
 +      Bypass the post-rewrite hook.
 +
  -i::
  --include::
        Before making a commit out of staged contents so far,
@@@ -280,6 -276,10 +280,10 @@@ configuration variable documented in li
        commit message template when using an editor to prepare the
        default commit message.
  
+ -S[<keyid>]::
+ --gpg-sign[=<keyid>]::
+       GPG-sign commit.
+ 
  \--::
        Do not interpret any more arguments as options.