]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'vd/scalar-to-main'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2022 21:35:25 +0000 (14:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Sep 2022 21:35:25 +0000 (14:35 -0700)
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

1  2 
Documentation/Makefile
Makefile
contrib/buildsystems/CMakeLists.txt

Simple merge
diff --cc Makefile
Simple merge
Simple merge