summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-16 07:16:07 (GMT)
commita3c2e2f32734c95e9226362b627a0b64fd69d3c8 (patch)
tree9d5bebbbee54eebedb73d4aaf90a0efa08e57f07
parentc63c2ff80c9e4b646301749ddd93039e99f091f6 (diff)
parente56b53553a175ff523c51c430ab99cef18b2d65e (diff)
downloadgit-a3c2e2f32734c95e9226362b627a0b64fd69d3c8.zip
git-a3c2e2f32734c95e9226362b627a0b64fd69d3c8.tar.gz
git-a3c2e2f32734c95e9226362b627a0b64fd69d3c8.tar.bz2
Merge branch 'nd/packobjectshook-doc-fix'
Doc update. * nd/packobjectshook-doc-fix: config.txt: correct the note about uploadpack.packObjectsHook
-rw-r--r--Documentation/config.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 7d58253..f6f4c21 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2996,15 +2996,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