Merge branch 'bc/object-id'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 8a115b3702ebe6c9a8af376b978503c8db295064..32f065ca6a9382ba7b496d9c6606a72941dc0c1f 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2853,6 +2853,18 @@ submodule.fetchJobs::
        in parallel. A value of 0 will give some reasonable default.
        If unset, it defaults to 1.
 
+submodule.alternateLocation::
+       Specifies how the submodules obtain alternates when submodules are
+       cloned. Possible values are `no`, `superproject`.
+       By default `no` is assumed, which doesn't add references. When the
+       value is set to `superproject` the submodule to be cloned computes
+       its alternates location relative to the superprojects alternate.
+
+submodule.alternateErrorStrategy
+       Specifies how to treat errors with the alternates for a submodule
+       as computed via `submodule.alternateLocation`. Possible values are
+       `ignore`, `info`, `die`. Default is `die`.
+
 tag.forceSignAnnotated::
        A boolean to specify whether annotated tags created should be GPG signed.
        If `--annotate` is specified on the command line, it takes