From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Oct 2017 01:48:05 GMT
Subject: Re: [PATCH v3] pull: pass --signoff/--no-signoff to "git merge"
Message-ID: <xmqqd15rx1gq.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <129274f0cc768b7a309f41315580fe1013636516.1507832722.git.wking@tremily.us>

"W. Trevor King" <wking@tremily.us> writes:

> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index 4df6431c34..0ada8c856b 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -64,14 +64,6 @@ OPTIONS
>  -------
>  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
> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index 4e32304301..f394622d65 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -51,6 +51,16 @@ set to `no` at the beginning of them.
>  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.

Makes sense.  Thanks, will queue.