{"thread":{"id":"46103","subject":"[PATCH] Documentation/git-rm: correct submodule description","startedAt":"2017-06-02T19:28:20Z","lastAt":"2017-06-02T19:28:20Z","messageCount":1,"participants":["Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"321423","messageId":"20170602192810.1230-1-sbeller@google.com","threadId":"46103","inReplyTo":null,"subject":"[PATCH] Documentation/git-rm: correct submodule description","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2017-06-02T19:28:10Z","receivedAt":"2017-06-02T19:28:20Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"Since 3ccd681c2a (Merge branch 'sb/submodule-rm-absorb', 2017-01-18)\ngit-rm tries to absorb any submodules git dir before deleting the\nsubmodule. Correct the documentation to say so.\n\nSigned-off-by: Stefan Beller <sbeller@google.com>\n---\n Documentation/git-rm.txt | 9 +++++----\n 1 file changed, 5 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt\nindex f1efc116eb..8c87e8cdd7 100644\n--- a/Documentation/git-rm.txt\n+++ b/Documentation/git-rm.txt\n@@ -140,10 +140,11 @@ Only submodules using a gitfile (which means they were cloned\n with a Git version 1.7.8 or newer) will be removed from the work\n tree, as their repository lives inside the .git directory of the\n superproject. If a submodule (or one of those nested inside it)\n-still uses a .git directory, `git rm` will fail - no matter if forced\n-or not - to protect the submodule's history. If it exists the\n-submodule.<name> section in the linkgit:gitmodules[5] file will also\n-be removed and that file will be staged (unless --cached or -n are used).\n+still uses a .git directory, `git rm` will move the submodules\n+git directory into the superprojects git directory to protect\n+the submodule's history. If it exists the submodule.<name> section\n+in the linkgit:gitmodules[5] file will also be removed and that file\n+will be staged (unless --cached or -n are used).\n \n A submodule is considered up-to-date when the HEAD is the same as\n recorded in the index, no tracked files are modified and no untracked\n-- \n2.13.0.17.gab62347cd9\n\n"}]}