Merge branch 'jc/merge-x-theirs-docfix' into maint

diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 8c87e8cdd772a42192f54a6a49789c6005eeb87d..683e59133003536c776c476304e369bdd80e27a2 100644 (file)
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -153,8 +153,8 @@ 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.
+work tree without committing the removal, use linkgit:git-submodule[1] `deinit`
+instead. Also see linkgit:gitsubmodules[7] for details on submodule removal.
 
 EXAMPLES
 --------