* [PATCH] tag: duplicate mention of --contains should mention --no-contains
@ 2017-05-15 12:23 Ævar Arnfjörð Bjarmason
2017-05-15 14:20 ` Marc Branchaud
2017-05-23 9:43 ` Ævar Arnfjörð Bjarmason
0 siblings, 2 replies; 5+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2017-05-15 12:23 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason
Fix a duplicate mention of --contains in the SYNOPSIS to mention
--no-contains.
This fixes an error introduced in my commit ac3f5a3468 ("ref-filter:
add --no-contains option to tag/branch/for-each-ref", 2017-03-24).
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Documentation/git-tag.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index f8a0b787f4..1eb15afa1c 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -12,7 +12,7 @@ SYNOPSIS
'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
<tagname> [<commit> | <object>]
'git tag' -d <tagname>...
-'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]
+'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
[--points-at <object>] [--column[=<options>] | --no-column]
[--create-reflog] [--sort=<key>] [--format=<format>]
[--[no-]merged [<commit>]] [<pattern>...]
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains
2017-05-15 12:23 [PATCH] tag: duplicate mention of --contains should mention --no-contains Ævar Arnfjörð Bjarmason
@ 2017-05-15 14:20 ` Marc Branchaud
2017-05-15 15:01 ` Ævar Arnfjörð Bjarmason
2017-05-23 9:43 ` Ævar Arnfjörð Bjarmason
1 sibling, 1 reply; 5+ messages in thread
From: Marc Branchaud @ 2017-05-15 14:20 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason, git; +Cc: Junio C Hamano
On 2017-05-15 08:23 AM, Ævar Arnfjörð Bjarmason wrote:
> Fix a duplicate mention of --contains in the SYNOPSIS to mention
> --no-contains.
>
> This fixes an error introduced in my commit ac3f5a3468 ("ref-filter:
> add --no-contains option to tag/branch/for-each-ref", 2017-03-24).
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> Documentation/git-tag.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
> index f8a0b787f4..1eb15afa1c 100644
> --- a/Documentation/git-tag.txt
> +++ b/Documentation/git-tag.txt
> @@ -12,7 +12,7 @@ SYNOPSIS
> 'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
> <tagname> [<commit> | <object>]
> 'git tag' -d <tagname>...
> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]
> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
I think
[--[no-]contains <commit>]
is the usual pattern...
> [--points-at <object>] [--column[=<options>] | --no-column]
> [--create-reflog] [--sort=<key>] [--format=<format>]
> [--[no-]merged [<commit>]] [<pattern>...]
... like with --[no-]merged, there.
M.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains
2017-05-15 14:20 ` Marc Branchaud
@ 2017-05-15 15:01 ` Ævar Arnfjörð Bjarmason
2017-05-15 15:47 ` Marc Branchaud
0 siblings, 1 reply; 5+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2017-05-15 15:01 UTC (permalink / raw)
To: Marc Branchaud; +Cc: Git Mailing List, Junio C Hamano
On Mon, May 15, 2017 at 4:20 PM, Marc Branchaud <marcnarc@xiplink.com> wrote:
> On 2017-05-15 08:23 AM, Ævar Arnfjörð Bjarmason wrote:
>>
>> Fix a duplicate mention of --contains in the SYNOPSIS to mention
>> --no-contains.
>>
>> This fixes an error introduced in my commit ac3f5a3468 ("ref-filter:
>> add --no-contains option to tag/branch/for-each-ref", 2017-03-24).
>>
>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> ---
>> Documentation/git-tag.txt | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
>> index f8a0b787f4..1eb15afa1c 100644
>> --- a/Documentation/git-tag.txt
>> +++ b/Documentation/git-tag.txt
>> @@ -12,7 +12,7 @@ SYNOPSIS
>> 'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
>> <tagname> [<commit> | <object>]
>> 'git tag' -d <tagname>...
>> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]
>> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
>
>
> I think
>
> [--[no-]contains <commit>]
>
> is the usual pattern...
>
>> [--points-at <object>] [--column[=<options>] | --no-column]
>> [--create-reflog] [--sort=<key>] [--format=<format>]
>> [--[no-]merged [<commit>]] [<pattern>...]
>
>
> ... like with --[no-]merged, there.
>
> M.
Thanks for the feedback, this was discussed earlier in the series and
we decided on the current format I'm submitting here.
Saying --[no-]merged is the convention we use for options where the
two are mutually exclusive, as is the case with the --[no-]merged
options:
$ git tag --merged v2.12.0 --no-merged v2.13.0
error: option `no-merged' is incompatible with --merged
[...]
But in the case of --contains and --no-contains you can provide both:
$ git tag --contains v2.12.0 --no-contains v2.13.0 'v*'
v2.12.0
v2.12.1
v2.12.2
v2.12.3
v2.13.0-rc0
v2.13.0-rc1
v2.13.0-rc2
So they don't use that convention, since it would imply that they're
mutually exclusive, rather than both being optional.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains
2017-05-15 15:01 ` Ævar Arnfjörð Bjarmason
@ 2017-05-15 15:47 ` Marc Branchaud
0 siblings, 0 replies; 5+ messages in thread
From: Marc Branchaud @ 2017-05-15 15:47 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Git Mailing List, Junio C Hamano
On 2017-05-15 11:01 AM, Ævar Arnfjörð Bjarmason wrote:
> On Mon, May 15, 2017 at 4:20 PM, Marc Branchaud <marcnarc@xiplink.com> wrote:
>> On 2017-05-15 08:23 AM, Ævar Arnfjörð Bjarmason wrote:
>>>
>>> Fix a duplicate mention of --contains in the SYNOPSIS to mention
>>> --no-contains.
>>>
>>> This fixes an error introduced in my commit ac3f5a3468 ("ref-filter:
>>> add --no-contains option to tag/branch/for-each-ref", 2017-03-24).
>>>
>>> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>>> ---
>>> Documentation/git-tag.txt | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
>>> index f8a0b787f4..1eb15afa1c 100644
>>> --- a/Documentation/git-tag.txt
>>> +++ b/Documentation/git-tag.txt
>>> @@ -12,7 +12,7 @@ SYNOPSIS
>>> 'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
>>> <tagname> [<commit> | <object>]
>>> 'git tag' -d <tagname>...
>>> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]
>>> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
>>
>>
>> I think
>>
>> [--[no-]contains <commit>]
>>
>> is the usual pattern...
>>
>>> [--points-at <object>] [--column[=<options>] | --no-column]
>>> [--create-reflog] [--sort=<key>] [--format=<format>]
>>> [--[no-]merged [<commit>]] [<pattern>...]
>>
>>
>> ... like with --[no-]merged, there.
>>
>> M.
>
> Thanks for the feedback, this was discussed earlier in the series and
> we decided on the current format I'm submitting here.
>
> Saying --[no-]merged is the convention we use for options where the
> two are mutually exclusive, as is the case with the --[no-]merged
> options:
>
> $ git tag --merged v2.12.0 --no-merged v2.13.0
> error: option `no-merged' is incompatible with --merged
> [...]
>
> But in the case of --contains and --no-contains you can provide both:
>
> $ git tag --contains v2.12.0 --no-contains v2.13.0 'v*'
> v2.12.0
> v2.12.1
> v2.12.2
> v2.12.3
> v2.13.0-rc0
> v2.13.0-rc1
> v2.13.0-rc2
>
> So they don't use that convention, since it would imply that they're
> mutually exclusive, rather than both being optional.
Ah, thanks. My mistake!
M.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] tag: duplicate mention of --contains should mention --no-contains
2017-05-15 12:23 [PATCH] tag: duplicate mention of --contains should mention --no-contains Ævar Arnfjörð Bjarmason
2017-05-15 14:20 ` Marc Branchaud
@ 2017-05-23 9:43 ` Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 5+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2017-05-23 9:43 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano, Ævar Arnfjörð Bjarmason
On Mon, May 15, 2017 at 2:23 PM, Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
> Fix a duplicate mention of --contains in the SYNOPSIS to mention
> --no-contains.
>
> This fixes an error introduced in my commit ac3f5a3468 ("ref-filter:
> add --no-contains option to tag/branch/for-each-ref", 2017-03-24).
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> Documentation/git-tag.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
> index f8a0b787f4..1eb15afa1c 100644
> --- a/Documentation/git-tag.txt
> +++ b/Documentation/git-tag.txt
> @@ -12,7 +12,7 @@ SYNOPSIS
> 'git tag' [-a | -s | -u <keyid>] [-f] [-m <msg> | -F <file>]
> <tagname> [<commit> | <object>]
> 'git tag' -d <tagname>...
> -'git tag' [-n[<num>]] -l [--contains <commit>] [--contains <commit>]
> +'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
> [--points-at <object>] [--column[=<options>] | --no-column]
> [--create-reflog] [--sort=<key>] [--format=<format>]
> [--[no-]merged [<commit>]] [<pattern>...]
> --
Junio: I think this one's fallen through the cracks, could you please
pick this up? It's also something that should be in 2.13.1.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-05-23 9:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-15 12:23 [PATCH] tag: duplicate mention of --contains should mention --no-contains Ævar Arnfjörð Bjarmason
2017-05-15 14:20 ` Marc Branchaud
2017-05-15 15:01 ` Ævar Arnfjörð Bjarmason
2017-05-15 15:47 ` Marc Branchaud
2017-05-23 9:43 ` Ævar Arnfjörð Bjarmason
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).