Re: [PATCH] doc: add missing --message long option to merge docs

[Junio C Hamano <gitster@pobox.com>]

"Brandon Dong via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Brandon <brandondong96@gmail.com>

As you identify yourself as "Brandon Dong" on the Signed-off-by line
below, please match this in-body From: line with it.

> Include mention of --message flag in merge docs to match what is
> accepted (builtin/merge.c) and to make it consistent with the git
> commit docs.
>
> Signed-off-by: Brandon Dong <brandondong96@gmail.com>
> ---
>     doc: add missing --message long option to merge docs
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2315%2Fbrandondong%2Fmerge_message_docs-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2315/brandondong/merge_message_docs-v1
> Pull-Request: https://github.com/git/git/pull/2315
>
>  Documentation/git-merge.adoc | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc
> index a055384ad6..6581f4c69c 100644
> --- a/Documentation/git-merge.adoc
> +++ b/Documentation/git-merge.adoc
> @@ -68,6 +68,7 @@ OPTIONS
>  include::merge-options.adoc[]
>  
>  `-m <msg>`::
> +`--message=<msg>`::
>  	Set the commit message to be used for the merge commit (in
>  	case one is created).
>  +

Hmph.  This is still not consistent with "git merge -h" output has,
which seems to accept --[no-]message as well.

It is not exactly your fault, but there are a few options other than
this one that support optional [no-] and they are not documented as
such, even though they appear in "git merge -h".  "git merge -m foo
--no-message other" behaves as if "GIT_EDITOR=: git merge other" was
run, it seems.