summaryrefslogtreecommitdiffstats
path: root/git-rm.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-09 15:35:20 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-09 15:35:20 -0700
commit8eac268d5824abada1efa8990ea211f476ca942b (patch)
tree712e2b7c4f6bcacc8bacfed4d7ee98ed8aa484ce /git-rm.html
parent91e3395c6964b309b071bf9fe79bd004c979b297 (diff)
downloadgit-htmldocs-8eac268d5824abada1efa8990ea211f476ca942b.tar.gz
Autogenerated HTML docs for v1.8.4-242-gbb80ee
Diffstat (limited to 'git-rm.html')
-rw-r--r--git-rm.html14
1 files changed, 9 insertions, 5 deletions
diff --git a/git-rm.html b/git-rm.html
index 49068ce8e..9c908656e 100644
--- a/git-rm.html
+++ b/git-rm.html
@@ -922,14 +922,19 @@ use the following command:</p></div>
<pre><code>git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached</code></pre>
</div></div>
</div>
-<div class="sect2">
-<h3 id="_submodules">Submodules</h3>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_submodules">SUBMODULES</h2>
+<div class="sectionbody">
<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, <code>git rm</code> will fail - no matter if forced
-or not - to protect the submodule&#8217;s history.</p></div>
+or not - to protect the submodule&#8217;s history. If it exists the
+submodule.&lt;name&gt; section in the <a href="gitmodules.html">gitmodules(5)</a> file will also
+be removed and that file will be staged (unless --cached or -n are used).</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.
@@ -940,7 +945,6 @@ work tree without committing the removal,
use <a href="git-submodule.html">git-submodule(1)</a> <code>deinit</code> instead.</p></div>
</div>
</div>
-</div>
<div class="sect1">
<h2 id="_examples">EXAMPLES</h2>
<div class="sectionbody">
@@ -986,7 +990,7 @@ of files and subdirectories under the <code>Documentation/</code> directory.</p>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-09 15:34:20 PDT
</div>
</div>
</body>