kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jm/bisect-run-synopsis-fix' 

Doc and usage message update.

* jm/bisect-run-synopsis-fix:
  doc/git-bisect: clarify `git bisect run` syntax
maint
Junio C Hamano 2023-10-31 12:57:44 +09:00
parent ece54894fe 3f02785de9
commit 692be87cbb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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-{new,bad}=<term> --term-{old,good}=<term>] git bisect start [--term-(new|bad)=<term-new> --term-(old|good)=<term-old>]
[--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>...]
@ -26,7 +26,7 @@ on the subcommand:
git bisect (visualize|view) git bisect (visualize|view)
git bisect replay <logfile> git bisect replay <logfile>
git bisect log git bisect log
git bisect run <cmd>... git bisect run <cmd> [<arg>...]
git bisect help git bisect help


This command uses a binary search algorithm to find which commit in This command uses a binary search algorithm to find which commit in

4
builtin/bisect.c
View File

@ -26,7 +26,7 @@ static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN") static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")


#define BUILTIN_GIT_BISECT_START_USAGE \ #define BUILTIN_GIT_BISECT_START_USAGE \
N_("git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]" \ N_("git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>]" \
" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]" \ " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--]" \
" [<pathspec>...]") " [<pathspec>...]")
#define BUILTIN_GIT_BISECT_STATE_USAGE \ #define BUILTIN_GIT_BISECT_STATE_USAGE \
@ -46,7 +46,7 @@ static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
#define BUILTIN_GIT_BISECT_LOG_USAGE \ #define BUILTIN_GIT_BISECT_LOG_USAGE \
"git bisect log" "git bisect log"
#define BUILTIN_GIT_BISECT_RUN_USAGE \ #define BUILTIN_GIT_BISECT_RUN_USAGE \
N_("git bisect run <cmd>...") N_("git bisect run <cmd> [<arg>...]")


static const char * const git_bisect_usage[] = { static const char * const git_bisect_usage[] = {
BUILTIN_GIT_BISECT_START_USAGE, BUILTIN_GIT_BISECT_START_USAGE,