Merge branch 'nk/config-local-doc' into maint

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 92bac27e05fca2f532fd2ae309dbc9f7b160c3d2..1d876c2619a414159a121868c5dbaab48e55a708 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -149,6 +149,10 @@ files that aren't ignored are present in the submodules work tree.
 Ignored files are deemed expendable and won't stop a submodule's work
 tree from being removed.
 
+If you only want to remove the local checkout of a submodule from your
+work tree without committing the removal,
+use linkgit:git-submodule[1] `deinit` instead.
+
 EXAMPLES
 --------
 `git rm Documentation/\*.txt`::