| Message ID | 20240207214436.538586-3-gitster@pobox.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 841dbd40a350b6bde402ca36a56c815f13f20480 |
| Headers | show |
| Series | minute "git bisect" doc updates | expand |
Le 07/02/2024 à 22:44, Junio C Hamano a écrit : > The syntax commonly used for alternatives is --opt-(a|b), not > --opt-{a,b}. > > List bad/new and good/old consistently in this order, to be > consistent with the description for "git bisect terms". Clarify > <term> to either <term-old> or <term-new> to make them consistent > with the description of "git bisect (good|bad)" subcommands. > > Suggested-by: Matthieu Moy <git@matthieu-moy.fr> > Signed-off-by: Junio C Hamano <gitster@pobox.com> > --- > Documentation/git-bisect.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt > index 3d813f9c77..73f889b97b 100644 > --- a/Documentation/git-bisect.txt > +++ b/Documentation/git-bisect.txt > @@ -16,7 +16,7 @@ DESCRIPTION > The command takes various subcommands, and different options depending > on the subcommand: > > - git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] > + git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>] > [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...] > git bisect (bad|new|<term-new>) [<rev>] > git bisect (good|old|<term-old>) [<rev>...] LGTM
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 3d813f9c77..73f889b97b 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -16,7 +16,7 @@ DESCRIPTION The command takes various subcommands, and different options depending on the subcommand: - git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] + git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...] git bisect (bad|new|<term-new>) [<rev>] git bisect (good|old|<term-old>) [<rev>...]
The syntax commonly used for alternatives is --opt-(a|b), not --opt-{a,b}. List bad/new and good/old consistently in this order, to be consistent with the description for "git bisect terms". Clarify <term> to either <term-old> or <term-new> to make them consistent with the description of "git bisect (good|bad)" subcommands. Suggested-by: Matthieu Moy <git@matthieu-moy.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/git-bisect.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)