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 /Documentation/Makefile | |
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 'Documentation/Makefile')
-rw-r--r-- | Documentation/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 849af6da30..12c533c1a3 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -21,6 +21,7 @@ MAN1_TXT += $(filter-out \ MAN1_TXT += git.txt MAN1_TXT += gitk.txt MAN1_TXT += gitweb.txt +MAN1_TXT += scalar.txt # man5 / man7 guides (note: new guides should also be added to command-list.txt) MAN5_TXT += gitattributes.txt @@ -116,6 +117,7 @@ TECH_DOCS += technical/parallel-checkout TECH_DOCS += technical/partial-clone TECH_DOCS += technical/racy-git TECH_DOCS += technical/reftable +TECH_DOCS += technical/scalar TECH_DOCS += technical/send-pack-pipeline TECH_DOCS += technical/shallow TECH_DOCS += technical/trivial-merge |