Merge branch 'ma/config-advice-markup-fix'

[thirdparty/git.git] / Documentation / config / advice.txt

diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 6aaa36020298f54f60cab1973b91641d684b9b18..4be93f8ad9c677e45c1dab652e28dab40bd36691 100644 (file)
--- 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.
 --