From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Nov 2017 05:24:24 +0000 (+0900)
Subject: Merge branch 'wk/pull-signoff'
X-Git-Tag: v2.16.0-rc0~166
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2?hp=-c

Merge branch 'wk/pull-signoff'

"git pull" has been taught to accept "--[no-]signoff" option and
pass it down to "git merge".

* wk/pull-signoff:
pull: pass --signoff/--no-signoff to "git merge"
---

fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2
diff --combined Documentation/git-merge.txt
index 3c6927b1fb,0ada8c856b..d5dfd8430f
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@@ -64,14 -64,12 +64,6 @@@ 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 --combined Documentation/merge-options.txt
index 2552ab8e8d,f394622d65..3888c3ff85
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -42,12 -42,6 +42,12 @@@ set to `no` at the beginning of them
  	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
@@@ -57,6 -51,16 +57,16 @@@
  With --no-log do not list one-line descriptions from the
  actual commits being merged.
  
+ --signoff::
+ --no-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).
+ +
+ With --no-signoff do not add a Signed-off-by line.
  
  --stat::
  -n::