diff options
| author |  Hugo Locurcio <hugo.locurcio@hugo.pro> | 2020-08-28 15:31:19 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-28 14:06:06 -0700 |
| commit | ef4d9f8a32f472feacb135c4e0508d53d0f93fb0 (patch) | |
| tree | 6f9486332a53e74384ef004c6558a2f361fd4552 | |
| parent | po: add missing letter for French message (diff) | |
| download | tgif-ef4d9f8a32f472feacb135c4e0508d53d0f93fb0.tar.xz | |
bisect: swap command-line options in documentation
The positional arguments are specified in this order: "bad" then "good".
To avoid confusion, the options above the positional arguments
are now specified in the same order. They can still be specified in any
order since they're options, not positional arguments.
Signed-off-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-bisect.txt | 2 | ||||
| -rw-r--r-- | builtin/bisect--helper.c | 2 | ||||
| -rwxr-xr-x | git-bisect.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 0e993e4587..fbb39fbdf5 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-{old,good}=<term> --term-{new,bad}=<term>] + git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...] git bisect (bad|new|<term-new>) [<rev>] git bisect (good|old|<term-old>) [<rev>...] diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index cdda279b23..7dcc1b5188 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -27,7 +27,7 @@ static const char * const git_bisect_helper_usage[] = { N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"), N_("git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"), N_("git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]"), - N_("git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}=<term>]" + N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]" " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"), NULL }; diff --git a/git-bisect.sh b/git-bisect.sh index c7580e51a0..3ec7558bdc 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -3,7 +3,7 @@ USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]' LONG_USAGE='git bisect help print this long help message. -git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>] +git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...] reset bisect state and start bisection. git bisect (bad|new) [<rev>] |