From: Junio C Hamano Date: Wed, 21 Nov 2018 13:58:01 +0000 (+0900) Subject: Merge branch 'nd/packobjectshook-doc-fix' into maint X-Git-Tag: v2.19.2~20 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/060d0617efe6d94eee1984c378df60c6d5442915?hp=6f1c8154aa359884aea6d1eb22c61ea323ebb96f Merge branch 'nd/packobjectshook-doc-fix' into maint Doc update. * nd/packobjectshook-doc-fix: config.txt: correct the note about uploadpack.packObjectsHook --- diff --git a/Documentation/config.txt b/Documentation/config.txt index ee3b5dd8ef..09a2385280 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -3634,15 +3634,15 @@ uploadpack.packObjectsHook:: was run. I.e., `upload-pack` will feed input intended for `pack-objects` to the hook, and expects a completed packfile on stdout. - -uploadpack.allowFilter:: - If this option is set, `upload-pack` will support partial - clone and partial fetch object filtering. + Note that this configuration variable is ignored if it is seen in the repository-level config (this is a safety measure against fetching from untrusted repositories). +uploadpack.allowFilter:: + If this option is set, `upload-pack` will support partial + clone and partial fetch object filtering. + uploadpack.allowRefInWant:: If this option is set, `upload-pack` will support the `ref-in-want` feature of the protocol version 2 `fetch` command. This feature