summaryrefslogtreecommitdiff
path: root/Documentation/git-rm.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:29 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:29 -0700
commitb03b41e24c84731742e132d86ef3e449dcd6ec25 (patch)
treec6ce8797dcf0c8ff0f71fd03f2b6b4e184f10cd3 /Documentation/git-rm.txt
parent4744b33705b7e4920cf7751ecafaac78927615b7 (diff)
parentcf419828064d4f22a2c3134e7b46a7719462b1dc (diff)
downloadgit-b03b41e24c84731742e132d86ef3e449dcd6ec25.tar.gz
Merge branch 'jl/submodule-deinit'
There was no Porcelain way to say "I no longer am interested in this submodule", once you express your interest in a submodule with "submodule init". "submodule deinit" is the way to do so. * jl/submodule-deinit: submodule: add 'deinit' command
Diffstat (limited to 'Documentation/git-rm.txt')
-rw-r--r--Documentation/git-rm.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 92bac27e05..1d876c2619 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -149,6 +149,10 @@ files that aren't ignored are present in the submodules work tree.
Ignored files are deemed expendable and won't stop a submodule's work
tree from being removed.
+If you only want to remove the local checkout of a submodule from your
+work tree without committing the removal,
+use linkgit:git-submodule[1] `deinit` instead.
+
EXAMPLES
--------
`git rm Documentation/\*.txt`::