diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-09 15:35:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 15:35:20 -0700 |
| commit | 8eac268d5824abada1efa8990ea211f476ca942b (patch) | |
| tree | 712e2b7c4f6bcacc8bacfed4d7ee98ed8aa484ce /git-rm.txt | |
| parent | 91e3395c6964b309b071bf9fe79bd004c979b297 (diff) | |
| download | git-htmldocs-8eac268d5824abada1efa8990ea211f476ca942b.tar.gz | |
Autogenerated HTML docs for v1.8.4-242-gbb80ee
Diffstat (limited to 'git-rm.txt')
| -rw-r--r-- | git-rm.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-rm.txt b/git-rm.txt index 1d876c261..9d731b453 100644 --- a/git-rm.txt +++ b/git-rm.txt @@ -134,14 +134,16 @@ use the following command: git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached ---------------- -Submodules -~~~~~~~~~~ +SUBMODULES +---------- 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. +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). 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 |