summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-24 14:50:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-24 14:50:44 -0700
commit88df0fa6597fd32b0394c544fb37d6655bd34a13 (patch)
tree994bc28a9b8fc27ca1cf2460a8377c79e737d9f6 /Documentation/config.txt
parentMerge branch 'jk/for-each-ref-icase' (diff)
parentfetch-pack: write shallow, then check connectivity (diff)
downloadtgif-88df0fa6597fd32b0394c544fb37d6655bd34a13.tar.xz
Merge branch 'jt/connectivity-check-after-unshallow'
"git fetch" failed to correctly validate the set of objects it received when making a shallow history deeper, which has been corrected. * jt/connectivity-check-after-unshallow: fetch-pack: write shallow, then check connectivity fetch-pack: implement ref-in-want fetch-pack: put shallow info in output parameter fetch: refactor to make function args narrower fetch: refactor fetch_refs into two functions fetch: refactor the population of peer ref OIDs upload-pack: test negotiation with changing repository upload-pack: implement ref-in-want test-pkt-line: add unpack-sideband subcommand
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a32172a43c..43b2de7b5f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3489,6 +3489,13 @@ 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.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