diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
| commit | 5dd1d59d35e1d8ea2101020df18298a9675d09b9 (patch) | |
| tree | b71edec710c0b0494b87c25787f6a5bf54984977 /Documentation | |
| parent | dac30e7b5dd6319039328b868a99e0732afab4ff (diff) | |
| parent | 4f3e57ef13d0ad4c00d0a87f0858cde81456a2e0 (diff) | |
| download | git-5dd1d59d35e1d8ea2101020df18298a9675d09b9.tar.xz | |
Merge branch 'jt/clone-recursesub-ref-advise'
The interaction between "git clone --recurse-submodules" and
alternate object store was ill-designed. The documentation and
code have been taught to make more clear recommendations when the
users see failures.
* jt/clone-recursesub-ref-advise:
submodule--helper: advise on fatal alternate error
Doc: explain submodule.alternateErrorStrategy
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config/advice.txt | 3 | ||||
| -rw-r--r-- | Documentation/config/submodule.txt | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 6aaa360202..d4e698cd3f 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -107,4 +107,7 @@ advice.*:: editor input from the user. nestedTag:: Advice shown if a user attempts to recursively tag a tag object. + submoduleAlternateErrorStrategyDie: + Advice shown when a submodule.alternateErrorStrategy option + configured to "die" causes a fatal error. -- diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt index 0a1293b051..b33177151c 100644 --- a/Documentation/config/submodule.txt +++ b/Documentation/config/submodule.txt @@ -79,4 +79,6 @@ submodule.alternateLocation:: 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`. + `ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore` + or `info`, and if there is an error with the computed alternate, the + clone proceeds as if no alternate was specified. |