Merge branch 'lb/status-stash-count'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index e83b0f6415743d840d4efbe635bbe3f8ee18ada5..2845e8d5c4f39e291dce8825153f57c63b3f3a54 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -348,6 +348,9 @@ advice.*::
        rmHints::
                In case of failure in the output of linkgit:git-rm[1],
                show directions on how to proceed from the current state.
+       addEmbeddedRepo::
+               Advice on what to do when you've accidentally added one
+               git repo inside of another.
 --
 
 core.fileMode::