git/Documentation, branch v2.37.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.37.22022-08-11T04:52:36ZGit 2.37.22022-08-11T04:52:36ZJunio C Hamanogitster@pobox.com2022-08-11T04:52:03Zurn:sha1:ad60dddad72dfb8367bd695028b5b8dc6c33661b
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Downmerge a bit more for 2.37.x2022-08-05T22:51:37ZJunio C Hamanogitster@pobox.com2022-08-05T22:43:57Zurn:sha1:a5b4466536668ce595300de249412b2c5b97deb1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'sg/index-format-doc-update' into maint2022-08-05T22:51:37ZJunio C Hamanogitster@pobox.com2022-08-05T22:51:37Zurn:sha1:19177019ed86038a559e0e9d8dc1b2114f13e195
Docfix.
source: <20220718085640.7395-1-szeder.dev@gmail.com>
* sg/index-format-doc-update:
index-format.txt: remove outdated list of supported extensions
Merge branch 'ma/sparse-checkout-cone-doc-fix' into maint2022-08-05T22:51:37ZJunio C Hamanogitster@pobox.com2022-08-05T22:51:37Zurn:sha1:94fc8a55c2046bd1853477455ca0a5d1f95f0608
Docfix.
source: <20220718100530.2068354-1-martin.agren@gmail.com>
* ma/sparse-checkout-cone-doc-fix:
config/core.txt: fix minor issues for `core.sparseCheckoutCone`
Merge branch 'ds/doc-wo-whitelist' into maint2022-08-05T22:51:37ZJunio C Hamanogitster@pobox.com2022-08-05T22:51:36Zurn:sha1:ef7b9ad032be2f0f06186083f3319c18bc002921
Avoid "white/black-list" in documentation and code comments.
source: <pull.1274.v3.git.1658255537.gitgitgadget@gmail.com>
* ds/doc-wo-whitelist:
transport.c: avoid "whitelist"
t: avoid "whitelist"
git.txt: remove redundant language
git-cvsserver: clarify directory list
daemon: clarify directory arguments
Merge branch 'mb/config-document-include' into maint2022-08-05T22:51:36ZJunio C Hamanogitster@pobox.com2022-08-05T22:51:36Zurn:sha1:d16978517c20911cbef6f98b78c6ec84ae1be57d
Add missing documentation for "include" and "includeIf" features in
"git config" file format, which incidentally teaches the command
line completion to include them in its offerings.
source: <pull.1285.v2.git.1658002423864.gitgitgadget@gmail.com>
* mb/config-document-include:
config.txt: document include, includeIf
Downmerge a handful of fixes for 2.37.x maintenance track2022-07-27T20:22:06ZJunio C Hamanogitster@pobox.com2022-07-27T20:22:06Zurn:sha1:00d12607a27e387ad78b5957afa05e89c87e83a5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'tk/rev-parse-doc-clarify-at-u' into maint2022-07-27T20:19:52ZJunio C Hamanogitster@pobox.com2022-07-27T20:19:52Zurn:sha1:32290a581834517a6447f3091e5de32fe4eca0b4
Doc update.
source: <pull.1265.v2.git.1655960512385.gitgitgadget@gmail.com>
* tk/rev-parse-doc-clarify-at-u:
rev-parse: documentation adjustment - mention remote tracking with @{u}
Merge branch 'pb/diff-doc-raw-format' into maint2022-07-27T20:19:49ZJunio C Hamanogitster@pobox.com2022-07-27T20:19:49Zurn:sha1:a3178b87203a226ac05dd90ada88787a994db7a2
Update "git diff/log --raw" format documentation.
source: <pull.1259.git.1655123383.gitgitgadget@gmail.com>
* pb/diff-doc-raw-format:
diff-index.txt: update raw output format in examples
diff-format.txt: correct misleading wording
diff-format.txt: dst can be 0* SHA-1 when path is deleted, too
Merge branch 'jk/revisions-doc-markup-fix' into maint2022-07-27T20:19:48ZJunio C Hamanogitster@pobox.com2022-07-27T20:19:48Zurn:sha1:84c3dfd023f8e5502a8c49dda92869df2142cd71
Documentation mark-up fix.
source: <YrOmsA04FZae89be@coredump.intra.peff.net>
* jk/revisions-doc-markup-fix:
revisions.txt: escape "..." to avoid asciidoc horizontal ellipsis