config.txt: correct the note about uploadpack.packObjectsHook

Document for uploadpack.packObjectsHook is added in [1] and consists of two paragraphs, the second one is quite important about where this variable can stay. When the paragraph about uploadpack.allowFilter is added in [2], it's added in between the two paragraphs. This makes the "this is non-repo level config" note incorrectly apply to allowFilter instead of packObjectsHook. Move allowFilter paragraph down to fix this. [1] 20b20a22f8 (upload-pack: provide a hook for running pack-objects - 2016-05-18) [2] 10ac85c785 (upload-pack: add object filtering for partial clone - 2017-12-08) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Sep 29, 2018 at 08:50 UTC e56b53553a175ff523c51c430ab99cef18b2d65e
1 file changed +4 -4
Documentation/config.txt
+4 -4
@@ -3268,15 +3268,15 @@ uploadpack.packObjectsHook::
3268 was run. I.e., `upload-pack` will feed input intended for
3269 `pack-objects` to the hook, and expects a completed packfile on
3270 stdout.
3271 -
3272 -uploadpack.allowFilter::
3273 - If this option is set, `upload-pack` will advertise partial
3274 - clone and partial fetch object filtering.
3271 +
3272 Note that this configuration variable is ignored if it is seen in the
3273 repository-level config (this is a safety measure against fetching from
3274 untrusted repositories).
3275
3276 +uploadpack.allowFilter::
3277 + If this option is set, `upload-pack` will support partial
3278 + clone and partial fetch object filtering.
3279 +
3280 url.<base>.insteadOf::
3281 Any URL that starts with this value will be rewritten to
3282 start, instead, with <base>. In cases where some site serves a