summaryrefslogtreecommitdiffstats
path: root/git-pull.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-04-05 00:21:10 +0000
committerJunio C Hamano <junio@kernel.org>2011-04-05 00:21:10 +0000
commit5cd1518ba777d6d41a66941c1af682009f26138a (patch)
treee4fd00535b26048036a5e57b81558169b10b4b18 /git-pull.html
parenta47bf3c145d71ffd27b5fa0bb05493765225d757 (diff)
downloadgit-htmldocs-5cd1518ba777d6d41a66941c1af682009f26138a.tar.gz
Autogenerated HTML docs for v1.7.5-rc0-131-gfa38c
Diffstat (limited to 'git-pull.html')
-rw-r--r--git-pull.html13
1 files changed, 11 insertions, 2 deletions
diff --git a/git-pull.html b/git-pull.html
index 8472ebbeb..a92f94544 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -494,7 +494,7 @@ must be given before the options meant for <em>git fetch</em>.</p></div>
</p>
</dd>
<dt class="hdlist1">
---[no-]recurse-submodules
+--[no-]recurse-submodules[=yes|on-demand|no]
</dt>
<dd>
<p>
@@ -1421,6 +1421,15 @@ $ git merge origin/next</tt></pre>
<div class="paragraph"><p>If you tried a pull which resulted in a complex conflicts and
would want to start over, you can recover with <em>git reset</em>.</p></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-fetch.html">git-fetch(1)</a>, <a href="git-merge.html">git-merge(1)</a>, <a href="git-config.html">git-config(1)</a></p></div>
@@ -1431,7 +1440,7 @@ would want to start over, you can recover with <em>git reset</em>.</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-04-05 00:20:31 UTC
</div>
</div>
</body>