summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-21 13:58:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-21 13:58:01 (GMT)
commit060d0617efe6d94eee1984c378df60c6d5442915 (patch)
tree83b55a3b804fe8ca6b8c8b3bde4d1e91c4a044ed /Documentation
parent6f1c8154aa359884aea6d1eb22c61ea323ebb96f (diff)
parente56b53553a175ff523c51c430ab99cef18b2d65e (diff)
downloadgit-060d0617efe6d94eee1984c378df60c6d5442915.zip
git-060d0617efe6d94eee1984c378df60c6d5442915.tar.gz
git-060d0617efe6d94eee1984c378df60c6d5442915.tar.bz2
Merge branch 'nd/packobjectshook-doc-fix' into maint
Doc update. * nd/packobjectshook-doc-fix: config.txt: correct the note about uploadpack.packObjectsHook
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ee3b5dd..09a2385 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