From: Junio C Hamano <gitster@pobox.com>
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?ds=inline;hp=--cc

Merge branch 'nd/packobjectshook-doc-fix' into maint

Doc update.

* nd/packobjectshook-doc-fix:
config.txt: correct the note about uploadpack.packObjectsHook
---

060d0617efe6d94eee1984c378df60c6d5442915
diff --cc Documentation/config.txt
index ee3b5dd8ef,8de50b086a..09a2385280
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -3643,13 -3273,10 +3639,17 @@@ Note that this configuration variable i
  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
 +	is intended for the benefit of load-balanced servers which may
 +	not have the same view of what OIDs their refs point to due to
 +	replication delay.
 +
  url.<base>.insteadOf::
  	Any URL that starts with this value will be rewritten to
  	start, instead, with <base>. In cases where some site serves a