summaryrefslogtreecommitdiffstats
path: root/git-submodule.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
committerJunio C Hamano <gitster@pobox.com>2013-07-12 15:47:46 -0700
commit8401f142a88980c91f3af6f06199e5579c9143c6 (patch)
tree3bce834aaee41a0b122eb45ab2ce5fb26a747df8 /git-submodule.html
parent5865559b9be66a59108c9f38b1e9f4d91201ebc6 (diff)
downloadgit-htmldocs-8401f142a88980c91f3af6f06199e5579c9143c6.tar.gz
Autogenerated HTML docs for v1.8.3.2-804-g0da7a
Diffstat (limited to 'git-submodule.html')
-rw-r--r--git-submodule.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-submodule.html b/git-submodule.html
index 045a97b2f..5e7650b4f 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -1075,7 +1075,7 @@ sync
<p>
This option is only valid for the update command. Instead of using
the superproject&#8217;s recorded SHA-1 to update the submodule, use the
- status of the submodule&#8217;s remote tracking branch. The remote used
+ status of the submodule&#8217;s remote-tracking branch. The remote used
is branch&#8217;s remote (<code>branch.&lt;name&gt;.remote</code>), defaulting to <code>origin</code>.
The remote branch used defaults to <code>master</code>, but the branch name may
be overridden by setting the <code>submodule.&lt;name&gt;.branch</code> option in
@@ -1209,7 +1209,7 @@ for details.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-05-17 16:33:07 PDT
+Last updated 2013-07-12 15:46:35 PDT
</div>
</div>
</body>