summaryrefslogtreecommitdiffstats
path: root/git-rm.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-13 14:32:04 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-13 14:32:04 -0800
commita129545d44f1f0fe9976ed87b9a7331bf239b7d8 (patch)
tree52268e539a6b33e18401455ea13cf579c615dc80 /git-rm.html
parent3b4382b85a92a6419a8f05510a9b583e711b5071 (diff)
downloadgit-htmldocs-a129545d44f1f0fe9976ed87b9a7331bf239b7d8.tar.gz
Autogenerated HTML docs for v1.8.0-150-gb0b00
Diffstat (limited to 'git-rm.html')
-rw-r--r--git-rm.html14
1 files changed, 13 insertions, 1 deletions
diff --git a/git-rm.html b/git-rm.html
index 19cbbf5c4..4df21a28a 100644
--- a/git-rm.html
+++ b/git-rm.html
@@ -723,6 +723,18 @@ want to record both the removal of paths and additions of new paths
as well as modifications of existing paths.</p></div>
<div class="paragraph"><p>Typically you would first remove all tracked files from the working
tree using this command:</p></div>
+<h3 id="_submodules">Submodules</h3><div style="clear:left"></div>
+<div class="paragraph"><p>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, <tt>git rm</tt> will fail - no matter if forced
+or not - to protect the submodule&#8217;s history.</p></div>
+<div class="paragraph"><p>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
+files that aren&#8217;t ignored are present in the submodules work tree.
+Ignored files are deemed expendable and won&#8217;t stop a submodule&#8217;s work
+tree from being removed.</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>git ls-files -z | xargs -0 rm -f</tt></pre>
@@ -785,7 +797,7 @@ of files and subdirectories under the <tt>Documentation/</tt> directory.</p></di
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2012-11-13 14:31:09 PDT
</div>
</div>
</body>