diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-19 14:35:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-19 14:35:25 -0700 |
| commit | 42bf77c7d013ac595b3463eb064b66d7b969f55c (patch) | |
| tree | 40780282254f5e857bf42016dec07b11d1ee2078 /builtin | |
| parent | 9d58241ee4e2c603404e028204221e508bb73644 (diff) | |
| parent | 9eb7a73158bdc91892a6b9a0b43b8f954b1e39e2 (diff) | |
| download | git-42bf77c7d013ac595b3463eb064b66d7b969f55c.tar.gz | |
Merge branch 'vd/scalar-to-main'
Hoist the remainder of "scalar" out of contrib/ to the main part of
the codebase.
* vd/scalar-to-main:
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
Diffstat (limited to 'builtin')
| -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); } |