undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: swap command-line options in documentation

Browse Source 
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>
This commit is contained in:
Hugo Locurcio 2020-08-28 15:31:19 +00:00 committed by Junio C Hamano
parent d9cd433147
commit ef4d9f8a32
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-bisect.txt
View File

@ -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>...]

2
builtin/bisect--helper.c
View File

@ -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
}; };

2
git-bisect.sh
View File

@ -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] [<bad> [<good>...]] [--] [<pathspec>...] [--no-checkout] [<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>]