From: Junio C Hamano Date: Sat, 24 Jun 2017 22:29:32 +0000 (-0700) Subject: Merge branch 'sb/submodule-rm-absorb' into maint X-Git-Tag: v2.13.2~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4f7132a9bed66d62a27f3ee9e01022d05e3ea2e5?hp=b960cd37c6ec11b35802216c38c9d02886f4fce8 Merge branch 'sb/submodule-rm-absorb' into maint Doc update to a recently graduated topic. * sb/submodule-rm-absorb: Documentation/git-rm: correct submodule description --- diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index f1efc116eb..8c87e8cdd7 100644 --- a/Documentation/git-rm.txt +++ b/Documentation/git-rm.txt @@ -140,10 +140,11 @@ Only submodules using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) -still uses a .git directory, `git rm` will fail - no matter if forced -or not - to protect the submodule's history. If it exists the -submodule. section in the linkgit:gitmodules[5] file will also -be removed and that file will be staged (unless --cached or -n are used). +still uses a .git directory, `git rm` will move the submodules +git directory into the superprojects git directory to protect +the submodule's history. If it exists the submodule. section +in the linkgit:gitmodules[5] file will also be removed and that file +will be staged (unless --cached or -n are used). A submodule is considered up-to-date when the HEAD is the same as recorded in the index, no tracked files are modified and no untracked