diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-31 12:57:44 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-31 12:57:44 +0900 |
| commit | 692be87cbba55e8488f805d236f2ad50483bd7d5 (patch) | |
| tree | 6ec1aa0a4a96a2c0aff045753278af8f5473dae7 | |
| parent | ece54894fef0b1bc08ce65b25acd7166ee623661 (diff) | |
| parent | 3f02785de9f6db28fec17e7100f70665e725b7c5 (diff) | |
| download | git-692be87cbba55e8488f805d236f2ad50483bd7d5.tar.gz | |
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
| -rw-r--r-- | Documentation/git-bisect.txt | 4 | ||||
| -rw-r--r-- | builtin/bisect.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 7872dba3ae..191b4a42b6 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-(new|bad)=<term-new> --term-(old|good)=<term-old>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...] git bisect (bad|new|<term-new>) [<rev>] git bisect (good|old|<term-old>) [<rev>...] @@ -26,7 +26,7 @@ on the subcommand: git bisect (visualize|view) git bisect replay <logfile> git bisect log - git bisect run <cmd>... + git bisect run <cmd> [<arg>...] git bisect help This command uses a binary search algorithm to find which commit in diff --git a/builtin/bisect.c b/builtin/bisect.c index 65478ef40f..35938b05fd 100644 --- a/builtin/bisect.c +++ b/builtin/bisect.c @@ -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") #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>...]] [--]" \ " [<pathspec>...]") #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 \ "git bisect log" #define BUILTIN_GIT_BISECT_RUN_USAGE \ - N_("git bisect run <cmd>...") + N_("git bisect run <cmd> [<arg>...]") static const char * const git_bisect_usage[] = { BUILTIN_GIT_BISECT_START_USAGE, |