diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2022-09-21 08:13:27 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-09-21 08:13:27 +0800 |
| commit | 2e2f4dd1e6ac94e7a0dbf212a74a3f1246a99d8e (patch) | |
| tree | db706cc504dbf82a30ae2268e44b3208ce902a61 /builtin/help.c | |
| parent | a275db6deca03169de04c9d4afd41bd3ba662ce3 (diff) | |
| parent | dda7228a83e2e9ff584bf6adbf55910565b41e14 (diff) | |
Merge branch 'main' of github.com:git/git
* 'main' of github.com:git/git: (45 commits)
A bit more of remaining topics before -rc1
t1800: correct test to handle Cygwin
chainlint: colorize problem annotations and test delimiters
ls-files: fix black space in error message
list-objects-filter: convert filter_spec to a strbuf
list-objects-filter: add and use initializers
list-objects-filter: handle null default filter spec
list-objects-filter: don't memset after releasing filter struct
builtin/mv.c: fix possible segfault in add_slash()
Documentation/technical: include Scalar technical doc
t/perf: add 'GIT_PERF_USE_SCALAR' run option
t/perf: add Scalar performance tests
scalar-clone: add test coverage
scalar: add to 'git help -a' command list
scalar: implement the `help` subcommand
git help: special-case `scalar`
scalar: include in standard Git build & installation
scalar: fix command documentation section header
t: retire unused chainlint.sed
t/Makefile: teach `make test` and `make prove` to run chainlint.pl
...
Diffstat (limited to 'builtin/help.c')
| -rw-r--r-- | builtin/help.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/help.c b/builtin/help.c index 09ac4289f1..6f2796f211 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -440,6 +440,8 @@ static const char *cmd_to_page(const char *git_cmd) return git_cmd; else if (is_git_command(git_cmd)) return xstrfmt("git-%s", git_cmd); + else if (!strcmp("scalar", git_cmd)) + return xstrdup(git_cmd); else return xstrfmt("git%s", git_cmd); } |