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://git.lorimer.id.au/gitweb.git/diff_plain/f07e5551a845b45076bf5c45118e16efa69610c4?ds=inline;hp=-c

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

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

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