summaryrefslogtreecommitdiffstats
path: root/git-submodule.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-03 16:22:37 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-03 16:22:37 -0800
commitdb472bc17bfef8588e1a8f6ce873e5c6f4fa384a (patch)
tree2ec72b39a55b4e44bfabb02d164fe298999e8aef /git-submodule.html
parent962f3a392a5b5c3f552a403dcc58d9f1eae2a930 (diff)
downloadgit-htmldocs-db472bc17bfef8588e1a8f6ce873e5c6f4fa384a.tar.gz
Autogenerated HTML docs for v1.7.8.2-321-g4570a
Diffstat (limited to 'git-submodule.html')
-rw-r--r--git-submodule.html9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-submodule.html b/git-submodule.html
index 58be4f838..c3fd18572 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -654,7 +654,12 @@ to exist in the superproject. If &lt;path&gt; is not given, the
<div class="paragraph"><p>&lt;repository&gt; is the URL of the new submodule&#8217;s origin repository.
This may be either an absolute URL, or (if it begins with ./
or ../), the location relative to the superproject&#8217;s origin
-repository. If the superproject doesn&#8217;t have an origin configured
+repository (Please note that to specify a repository <em>foo.git</em>
+which is located right next to a superproject <em>bar.git</em>, you&#8217;ll
+have to use <em>../foo.git</em> instead of <em>./foo.git</em> - as one might expect
+when following the rules for relative URLs - because the evaluation
+of relative URLs in Git is identical to that of relative directories).
+If the superproject doesn&#8217;t have an origin configured
the superproject is its own authoritative upstream and the current
working directory is used instead.</p></div>
<div class="paragraph"><p>&lt;path&gt; is the relative location for the cloned submodule to
@@ -966,7 +971,7 @@ for details.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-01-03 16:22:22 PDT
</div>
</div>
</body>