Merge branch 'jk/warn-add-gitlink'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f6278a5ae6a1f554ddb8b9861d9067181b928bb5..781ce3e855368ac04ea3b07cf291513e4bfb04df 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::