Merge branch 'ph/tag-force-no-warn-on-creation'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 975d3d18d5e5873b37ab5b29dcbb9b6cab2dbc6f..c1f435f6df0b2e16d50546b61c2abab50b67acc0 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2123,7 +2123,13 @@ uploadpack.hiderefs::
        are under the hierarchies listed on the value of this
        variable is excluded, and is hidden from `git ls-remote`,
        `git fetch`, etc.  An attempt to fetch a hidden ref by `git
-       fetch` will fail.
+       fetch` will fail.  See also `uploadpack.allowtipsha1inwant`.
+
+uploadpack.allowtipsha1inwant::
+       When `uploadpack.hiderefs` is in effect, allow `upload-pack`
+       to accept a fetch request that asks for an object at the tip
+       of a hidden ref (by default, such a request is rejected).
+       see also `uploadpack.hiderefs`.
 
 url.<base>.insteadOf::
        Any URL that starts with this value will be rewritten to