From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Dec 2012 23:24:51 +0000 (-0800)
Subject: Merge branch 'tj/maint-doc-commit-sign' into maint
X-Git-Tag: v1.8.0.3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4f96f1fbaba67331f3a7bf10847317e1aed4e5dc?ds=inline;hp=-c

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"
---

4f96f1fbaba67331f3a7bf10847317e1aed4e5dc
diff --combined Documentation/git-commit.txt
index 15cec8601c,a65d726556..19cbb9098f
--- 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
  -----------
@@@ -184,11 -184,6 +184,11 @@@ OPTION
  	commit log message unmodified.  This option lets you
  	further edit the message taken from these sources.
  
 +--no-edit::
 +	Use the selected commit message without launching an editor.
 +	For example, `git commit --amend --no-edit` amends a commit
 +	without changing its commit message.
 +
  --amend::
  	Used to amend the tip of the current branch. Prepare the tree
  	object you would want to replace the latest commit as usual
@@@ -198,6 -193,10 +198,6 @@@
  	current tip -- if it was a merge, it will have the parents of
  	the current tip as parents -- so the current top commit is
  	discarded.
 -
 ---no-post-rewrite::
 -	Bypass the post-rewrite hook.
 -
  +
  --
  It is a rough equivalent for:
@@@ -214,9 -213,6 +214,9 @@@ You should understand the implications 
  amend a commit that has already been published.  (See the "RECOVERING
  FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
  
 +--no-post-rewrite::
 +	Bypass the post-rewrite hook.
 +
  -i::
  --include::
  	Before making a commit out of staged contents so far,
@@@ -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.