Merge branch 'dp/submodule-doc-markup-fix'

Doc fix.

* dp/submodule-doc-markup-fix:
  config.txt: fix formatting of submodule.alternateErrorStrategy section
maint
Junio C Hamano 2017-02-16 14:45:15 -08:00
commit 62fef5c564
1 changed files with 1 additions and 1 deletions

View File

@ -2949,7 +2949,7 @@ submodule.alternateLocation::
value is set to `superproject` the submodule to be cloned computes value is set to `superproject` the submodule to be cloned computes
its alternates location relative to the superprojects alternate. its alternates location relative to the superprojects alternate.


submodule.alternateErrorStrategy submodule.alternateErrorStrategy::
Specifies how to treat errors with the alternates for a submodule Specifies how to treat errors with the alternates for a submodule
as computed via `submodule.alternateLocation`. Possible values are as computed via `submodule.alternateLocation`. Possible values are
`ignore`, `info`, `die`. Default is `die`. `ignore`, `info`, `die`. Default is `die`.