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

* tj/maint-doc-commit-sign:
  Add -S, --gpg-sign option to manpage of "git commit"
This commit is contained in:
Jeff King
2012-11-04 08:00:47 -05:00

View File

@ -13,7 +13,7 @@ SYNOPSIS
[-F <file> | -m <msg>] [--reset-author] [--allow-empty] [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
[--allow-empty-message] [--no-verify] [-e] [--author=<author>] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
[--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
[-i | -o] [--] [<file>...] [-i | -o] [-S[<keyid>]] [--] [<file>...]
DESCRIPTION DESCRIPTION
----------- -----------
@ -280,6 +280,10 @@ configuration variable documented in linkgit:git-config[1].
commit message template when using an editor to prepare the commit message template when using an editor to prepare the
default commit message. default commit message.
-S[<keyid>]::
--gpg-sign[=<keyid>]::
GPG-sign commit.
\--:: \--::
Do not interpret any more arguments as options. Do not interpret any more arguments as options.