From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 02 Apr 2020 18:07:19 GMT
Subject: Re: [PATCH v2 5/5] Documentation: document merge option --no-gpg-sign
Message-ID: <xmqqo8s93go8.fsf@gitster.c.googlers.com>
In-Reply-To: <d35dd89c52e427861c38d17e43c61fca149dbfd5.1585821581.git.congdanhqx@gmail.com>

Đoàn Trần Công Danh  <congdanhqx@gmail.com> writes:

> Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
> ---
>  Documentation/merge-options.txt | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index 40dc4f5e8c..c46e4fe598 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -61,9 +61,12 @@ When not possible, refuse to merge and exit with a non-zero status.
>  
>  -S[<keyid>]::
>  --gpg-sign[=<keyid>]::
> +--no-gpg-sign::
>  	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.
> +	it must be stuck to the option without a space. "--no-gpg-sign"
> +	is useful to countermand both `commit.gpgSign` configuration variable,
> +	and earlier "--gpg-sign".

Shouldn't [4/5] also add '--no-gpg-sign' to the header like the
above?

Other than that, all patches were pleasant read.
Thanks.