diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-04-05 00:21:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-04-05 00:21:10 +0000 |
| commit | 5cd1518ba777d6d41a66941c1af682009f26138a (patch) | |
| tree | e4fd00535b26048036a5e57b81558169b10b4b18 /git-fetch.html | |
| parent | a47bf3c145d71ffd27b5fa0bb05493765225d757 (diff) | |
| download | git-htmldocs-5cd1518ba777d6d41a66941c1af682009f26138a.tar.gz | |
Autogenerated HTML docs for v1.7.5-rc0-131-gfa38c
Diffstat (limited to 'git-fetch.html')
| -rw-r--r-- | git-fetch.html | 46 |
1 files changed, 42 insertions, 4 deletions
diff --git a/git-fetch.html b/git-fetch.html index fda83e29f..2c437f86a 100644 --- a/git-fetch.html +++ b/git-fetch.html @@ -561,12 +561,28 @@ there is a remotes.<group> entry in the configuration file. </p>
</dd>
<dt class="hdlist1">
---[no-]recurse-submodules
+--recurse-submodules[=yes|on-demand|no]
</dt>
<dd>
<p>
- This option controls if new commits of all populated submodules should
- be fetched too (see <a href="git-config.html">git-config(1)</a> and <a href="gitmodules.html">gitmodules(5)</a>).
+ This option controls if and under what conditions new commits of
+ populated submodules should be fetched too. It can be used as a
+ boolean option to completely disable recursion when set to <em>no</em> or to
+ unconditionally recurse into all populated submodules when set to
+ <em>yes</em>, which is the default when this option is used without any
+ value. Use <em>on-demand</em> to only recurse into a populated submodule
+ when the superproject retrieves a commit that updates the submodule’s
+ reference to a commit that isn’t already in the local submodule
+ clone.
+</p>
+</dd>
+<dt class="hdlist1">
+--no-recurse-submodules
+</dt>
+<dd>
+<p>
+ Disable recursive fetching of submodules (this has the same effect as
+ using the <em>--recurse-submodules=no</em> option).
</p>
</dd>
<dt class="hdlist1">
@@ -580,6 +596,19 @@ there is a remotes.<group> entry in the configuration file. </p>
</dd>
<dt class="hdlist1">
+--recurse-submodules-default=[yes|on-demand]
+</dt>
+<dd>
+<p>
+ This option is used internally to temporarily provide a
+ non-negative default value for the --recurse-submodules
+ option. All other methods of configuring fetch’s submodule
+ recursion (such as settings in <a href="gitmodules.html">gitmodules(5)</a> and
+ <a href="git-config.html">git-config(1)</a>) override this option, as does
+ specifying --[no-]recurse-submodules directly.
+</p>
+</dd>
+<dt class="hdlist1">
-u
</dt>
<dt class="hdlist1">
@@ -994,6 +1023,15 @@ because it is prefixed with a plus sign; <tt>tmp</tt> will not be.</p></div> </li>
</ul></div>
</div>
+<h2 id="_bugs">BUGS</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Using --recurse-submodules can only fetch new commits in already checked
+out submodules right now. When e.g. upstream added a new submodule in the
+just fetched commits of the superproject the submodule itself can not be
+fetched, making it impossible to check out that submodule later without
+having to do a fetch again. This is expected to be fixed in a future git
+version.</p></div>
+</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-pull.html">git-pull(1)</a></p></div>
@@ -1004,7 +1042,7 @@ because it is prefixed with a plus sign; <tt>tmp</tt> will not be.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-04-05 00:20:31 UTC
</div>
</div>
</body>
|