From: Jeff King <peff@peff.net>
Date: Sun, 4 Nov 2012 13:00:47 +0000 (-0500)
Subject: Merge branch 'tj/maint-doc-commit-sign'
X-Git-Tag: v1.8.1-rc0~82
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/f07e5551a845b45076bf5c45118e16efa69610c4?hp=0d2605112e25bb614d65771a04356639ab370dc3

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

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

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 3acf2e70d6..0295890621 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.