Re: [PATCH v2 02/16] tag doc: split up the --[no-]merged documentation

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 21, 2017, 18:26 UTC
Message-ID: <xmqq60j2qyf8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170321125901.10652-3-avarab@gmail.com>

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

Show 7 quoted lines

> Split up the --[no-]merged documentation into documentation that
> documents each option independently. This is in line with how "branch"
> and "for-each-ref" are documented, and makes subsequent changes to
> discuss the limits & caveats of each option easier to read.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---

This is consistent with a possible future (i.e. you do not have to be the one to realize it) where "--merged A --no-merged B" can be given together. Makes sense.

Show 25 quoted lines

>  Documentation/git-tag.txt | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
> index 33f18ea5fb..68b0ab2410 100644
> --- a/Documentation/git-tag.txt
> +++ b/Documentation/git-tag.txt
> @@ -124,10 +124,13 @@ This option is only applicable when listing tags without annotation lines.
>  	Only list tags which contain the specified commit (HEAD if not
>  	specified).
>  
> ---[no-]merged [<commit>]::
> -	Only list tags whose tips are reachable, or not reachable
> -	if `--no-merged` is used, from the specified commit (`HEAD`
> -	if not specified).
> +--merged [<commit>]::
> +	Only list tags whose tips are reachable from the specified commit
> +	(`HEAD` if not specified).
> +
> +--no-merged [<commit>]::
> +	Only list tags whose tips are not reachable from the specified
> +	commit (`HEAD` if not specified).
>  
>  --points-at <object>::
>  	Only list tags of the given object.