mirror of https://github.com/git/git.git
Merge branch 'hl/bisect-doc-clarify-bad-good-ordering'
Doc update. * hl/bisect-doc-clarify-bad-good-ordering: bisect: swap command-line options in documentation
This commit is contained in:
commit
da6b99c39a
|
@ -16,7 +16,7 @@ DESCRIPTION
|
||||||
The command takes various subcommands, and different options depending
|
The command takes various subcommands, and different options depending
|
||||||
on the subcommand:
|
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>...]
|
[--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]
|
||||||
git bisect (bad|new|<term-new>) [<rev>]
|
git bisect (bad|new|<term-new>) [<rev>]
|
||||||
git bisect (good|old|<term-old>) [<rev>...]
|
git bisect (good|old|<term-old>) [<rev>...]
|
||||||
|
|
|
@ -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-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-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-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>...]"),
|
" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
|
USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
|
||||||
LONG_USAGE='git bisect help
|
LONG_USAGE='git bisect help
|
||||||
print this long help message.
|
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] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
|
[--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
|
||||||
reset bisect state and start bisection.
|
reset bisect state and start bisection.
|
||||||
git bisect (bad|new) [<rev>]
|
git bisect (bad|new) [<rev>]
|
||||||
|
|
Loading…
Reference in New Issue