summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-11-04 13:00:47 (GMT)
committerJeff King <peff@peff.net>2012-11-04 13:00:47 (GMT)
commitf07e5551a845b45076bf5c45118e16efa69610c4 (patch)
treec44d3980fcc965375443a48b0222df957fb5705a /Documentation
parent0d2605112e25bb614d65771a04356639ab370dc3 (diff)
parent098bbdc31c8dc66e2c7a1a531625502be512b016 (diff)
downloadgit-f07e5551a845b45076bf5c45118e16efa69610c4.zip
git-f07e5551a845b45076bf5c45118e16efa69610c4.tar.gz
git-f07e5551a845b45076bf5c45118e16efa69610c4.tar.bz2
Merge branch 'tj/maint-doc-commit-sign'
* tj/maint-doc-commit-sign: Add -S, --gpg-sign option to manpage of "git commit"
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-commit.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 3acf2e7..0295890 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.