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

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

diff --combined Documentation/git-commit.txt
index 3acf2e70d652906d696bb9b11e31d52786e1a4f9,a65d726556af2d512b276576c36c7c2473d4ba02..0295890621117ae3981485eec5872d3dcfb23af6
--- 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
  -----------
@@@ -109,10 -109,6 +109,10 @@@ OPTION
        format. See linkgit:git-status[1] for details. Implies
        `--dry-run`.
  
 +--long::
 +      When doing a dry-run, give the output in a the long-format.
 +      Implies `--dry-run`.
 +
  -z::
  --null::
        When showing `short` or `porcelain` status output, terminate
@@@ -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.