From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 19 Oct 2017 05:45:43 +0000 (+0900)
Subject: Merge branch 'wk/merge-options-gpg-sign-doc'
X-Git-Tag: v2.15.0-rc2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f8468be43df74665bfd9fd925d8ab6fc74f963f;p=thirdparty%2Fgit.git

Merge branch 'wk/merge-options-gpg-sign-doc'

Doc updates.

* wk/merge-options-gpg-sign-doc:
  Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'
---

9f8468be43df74665bfd9fd925d8ab6fc74f963f
diff --cc Documentation/git-merge.txt
index 4df6431c34,1d97a17904..3c6927b1fb
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -64,20 -64,6 +64,14 @@@ OPTION
  -------
  include::merge-options.txt[]
  
 +--signoff::
 +	Add Signed-off-by line by the committer at the end of the commit
 +	log message.  The meaning of a signoff depends on the project,
 +	but it typically certifies that committer has
 +	the rights to submit this work under the same license and
 +	agrees to a Developer Certificate of Origin
 +	(see http://developercertificate.org/ for more information).
 +
- -S[<keyid>]::
- --gpg-sign[=<keyid>]::
- 	GPG-sign the resulting merge commit. The `keyid` argument is
- 	optional and defaults to the committer identity; if specified,
- 	it must be stuck to the option without a space.
- 
  -m <msg>::
  	Set the commit message to be used for the merge commit (in
  	case one is created).
diff --cc Documentation/merge-options.txt
index 4e32304301,6d85a76872..2552ab8e8d
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -39,9 -39,15 +39,15 @@@ set to `no` at the beginning of them
  
  --ff-only::
  	Refuse to merge and exit with a non-zero status unless the
 -	current `HEAD` is already up-to-date or the merge can be
 +	current `HEAD` is already up to date or the merge can be
  	resolved as a fast-forward.
  
+ -S[<keyid>]::
+ --gpg-sign[=<keyid>]::
+ 	GPG-sign the resulting merge commit. The `keyid` argument is
+ 	optional and defaults to the committer identity; if specified,
+ 	it must be stuck to the option without a space.
+ 
  --log[=<n>]::
  --no-log::
  	In addition to branch names, populate the log message with