From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Oct 2018 07:16:07 +0000 (+0900)
Subject: Merge branch 'nd/packobjectshook-doc-fix'
X-Git-Tag: v2.20.0-rc0~173
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a3c2e2f32734c95e9226362b627a0b64fd69d3c8

Merge branch 'nd/packobjectshook-doc-fix'

Doc update.

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

a3c2e2f32734c95e9226362b627a0b64fd69d3c8
diff --cc Documentation/config.txt
index 7d58253368,8de50b086a..f6f4c21a54
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -3005,13 -3273,10 +3001,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