summaryrefslogtreecommitdiffstats
path: root/git-submodule.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 16:37:03 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-25 16:37:03 -0700
commit240dc3fd4523f8d7034fc6ab627d271d5b273487 (patch)
tree3b8708d75bb9b6a11375c8c2db1e3bc4ee56aa81 /git-submodule.html
parent5e7f131ec750093b9c1691ff92db43b0595ea98c (diff)
downloadgit-htmldocs-240dc3fd4523f8d7034fc6ab627d271d5b273487.tar.gz
Autogenerated HTML docs for v1.8.2-200-g7632c
Diffstat (limited to 'git-submodule.html')
-rw-r--r--git-submodule.html24
1 files changed, 22 insertions, 2 deletions
diff --git a/git-submodule.html b/git-submodule.html
index 06668ae34..bebf88107 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -750,6 +750,7 @@ git-submodule(1) Manual Page
[--reference &lt;repository&gt;] [--] &lt;repository&gt; [&lt;path&gt;]
<em>git submodule</em> [--quiet] status [--cached] [--recursive] [--] [&lt;path&gt;&#8230;]
<em>git submodule</em> [--quiet] init [--] [&lt;path&gt;&#8230;]
+<em>git submodule</em> [--quiet] deinit [-f|--force] [--] &lt;path&gt;&#8230;
<em>git submodule</em> [--quiet] update [--init] [--remote] [-N|--no-fetch]
[-f|--force] [--rebase] [--reference &lt;repository&gt;]
[--merge] [--recursive] [--] [&lt;path&gt;&#8230;]
@@ -884,6 +885,23 @@ init
</p>
</dd>
<dt class="hdlist1">
+deinit
+</dt>
+<dd>
+<p>
+ Unregister the given submodules, i.e. remove the whole
+ <code>submodule.$name</code> section from .git/config together with their work
+ tree. Further calls to <code>git submodule update</code>, <code>git submodule foreach</code>
+ and <code>git submodule sync</code> will skip any unregistered submodules until
+ they are initialized again, so use this command if you don&#8217;t want to
+ have a local checkout of the submodule in your work tree anymore. If
+ you really want to remove a submodule from the repository and commit
+ that use <a href="git-rm.html">git-rm(1)</a> instead.
+</p>
+<div class="paragraph"><p>If <code>--force</code> is specified, the submodule&#8217;s work tree will be removed even if
+it contains local modifications.</p></div>
+</dd>
+<dt class="hdlist1">
update
</dt>
<dd>
@@ -1001,8 +1019,10 @@ sync
</dt>
<dd>
<p>
- This option is only valid for add and update commands.
+ This option is only valid for add, deinit and update commands.
When running add, allow adding an otherwise ignored submodule path.
+ When running deinit the submodule work trees will be removed even if
+ they contain local changes.
When running update, throw away local changes in submodules when
switching to a different commit; and always run a checkout operation
in the submodule, even if the commit listed in the index of the
@@ -1185,7 +1205,7 @@ for details.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-01 14:13:12 PST
+Last updated 2013-03-25 16:35:50 PDT
</div>
</div>
</body>