diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-12-27 15:24:51 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-12-27 15:25:03 -0800 |
commit | 4f96f1fbaba67331f3a7bf10847317e1aed4e5dc (patch) | |
tree | e0414e3dc05d6375720d2b9653faca506af4a2b0 | |
parent | 0b830ac52137f0f0a8f17e4caee5db7f0dee1ecc (diff) | |
parent | 098bbdc31c8dc66e2c7a1a531625502be512b016 (diff) | |
download | git-4f96f1fbaba67331f3a7bf10847317e1aed4e5dc.tar.gz git-4f96f1fbaba67331f3a7bf10847317e1aed4e5dc.tar.xz |
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"
-rw-r--r-- | Documentation/git-commit.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 15cec8601..19cbb9098 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -13,7 +13,7 @@ SYNOPSIS [-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 ----------- @@ -280,6 +280,10 @@ configuration variable documented in linkgit:git-config[1]. 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. |