summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-19 19:38:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-19 19:38:44 (GMT)
commitd04787e645abab1c50651fd41a748b43ac68c819 (patch)
tree124ce258d6aba3b2528f81fa715da85631aac08c
parentae7e4d4fedc2237217a9f802eba4ded9ea66bb91 (diff)
parent68602c01fde24d3b5cbcc4817bb85ab309684def (diff)
downloadgit-d04787e645abab1c50651fd41a748b43ac68c819.zip
git-d04787e645abab1c50651fd41a748b43ac68c819.tar.gz
git-d04787e645abab1c50651fd41a748b43ac68c819.tar.bz2
Merge branch 'sb/submodule-rm-absorb'
Doc update to a recently graduated topic. * sb/submodule-rm-absorb: Documentation/git-rm: correct submodule description
-rw-r--r--Documentation/git-rm.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index f1efc11..8c87e8c 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.<name> 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.<name> 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