diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-16 14:45:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-16 14:45:15 -0800 |
| commit | 62fef5c5645ccb47894741b435d753aa3d57851b (patch) | |
| tree | 07f03ecb65ba97b0e7dcc3eaed4dd42a062ac18b | |
| parent | 1f73ff0802c63bf01bcf30ee7b9e8d310cbee375 (diff) | |
| parent | 8ab9740d9f6dd0f0af87b7ac32a407d0a8aeacab (diff) | |
| download | git-62fef5c5645ccb47894741b435d753aa3d57851b.tar.gz git-62fef5c5645ccb47894741b435d753aa3d57851b.tar.xz | |
Merge branch 'dp/submodule-doc-markup-fix'
Doc fix.
* dp/submodule-doc-markup-fix:
config.txt: fix formatting of submodule.alternateErrorStrategy section
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index fc5a28a32..015346c41 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2949,7 +2949,7 @@ submodule.alternateLocation:: value is set to `superproject` the submodule to be cloned computes its alternates location relative to the superprojects alternate. -submodule.alternateErrorStrategy +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`. |