Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign

[Kevin Daudt <me@ikke.info>]

On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote:
> Pull has supported these since ea230d8 (pull: add the --gpg-sign
> option, 2014-02-10).  Insert in long-option alphabetical order
> following 7c85d274 (Documentation/merge-options.txt: order options in
> alphabetical groups, 2009-10-22).
> 
> Signed-off-by: W. Trevor King <wking@tremily.us>
> ---
> This patch is based on maint.  It will have trivial conflicts with the
> --signoff docs which landed in 14d01b4f07 (merge: add a --signoff
> flag, 2017-07-04, v2.15.0-rc0~138^2).
> 
>  Documentation/git-merge.txt     | 6 ------
>  Documentation/merge-options.txt | 6 ++++++
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index f90faf7aaa..1d97a17904 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -64,12 +64,6 @@ OPTIONS
>  -------
>  include::merge-options.txt[]
>  
> --S[<keyid>]::
> ---gpg-sign[=<keyid>]::

Shouldn't the options self be removed here too, not just the
explanation?

> -	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 --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index 5b4a62e936..6d85a76872 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -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
> -- 
> 2.13.6
>