diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-19 13:10:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-19 13:10:12 -0700 |
| commit | a275c1fc6c3b8415252c3d3ec814f0bdfb029ccf (patch) | |
| tree | 48743ff3353d2b6a18f6015ddd2f22d2d5b88d4a /git-rm.txt | |
| parent | 3a31ce59d3f4464f0cd0b66080878bd2f5530861 (diff) | |
| download | git-htmldocs-a275c1fc6c3b8415252c3d3ec814f0bdfb029ccf.tar.gz | |
Autogenerated HTML docs for v2.13.1-516-g05ec6
Diffstat (limited to 'git-rm.txt')
| -rw-r--r-- | git-rm.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/git-rm.txt b/git-rm.txt index f1efc116e..8c87e8cdd 100644 --- a/git-rm.txt +++ b/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 |