mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
Merge branch 'sb/submodule-rm-absorb'
Doc update to a recently graduated topic. * sb/submodule-rm-absorb: Documentation/git-rm: correct submodule description
This commit is contained in:
commit
d04787e645
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue