diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-06-22 15:42:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-22 15:42:39 -0700 |
commit | 7f2b3cb98f6fbfdd4680aa7d74f51f55e2174ef1 (patch) | |
tree | 819126657300af330e6ed6c5c78238226e5c2a2b /git-submodule.html | |
parent | a28a920b817789e9535e30d163d1cfeda9803b99 (diff) | |
download | git-htmldocs-7f2b3cb98f6fbfdd4680aa7d74f51f55e2174ef1.tar.gz |
Autogenerated HTML docs for v1.7.11.1-29-gf71be
Diffstat (limited to 'git-submodule.html')
-rw-r--r-- | git-submodule.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-submodule.html b/git-submodule.html index 44cb5f30d..fdd71731b 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -725,7 +725,7 @@ update checkout the commit specified in the index of the containing repository.
This will make the submodules HEAD be detached unless <tt>--rebase</tt> or
<tt>--merge</tt> is specified or the key <tt>submodule.$name.update</tt> is set to
- <tt>rebase</tt>, <tt>merge</tt> or <tt>none</tt>. <tt>none</tt> can be overriden by specifying
+ <tt>rebase</tt>, <tt>merge</tt> or <tt>none</tt>. <tt>none</tt> can be overridden by specifying
<tt>--checkout</tt>.
</p>
<div class="paragraph"><p>If the submodule is not yet initialized, and you just want to use the
@@ -969,7 +969,7 @@ for details.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-17 15:54:44 PDT
+Last updated 2012-06-22 15:42:03 PDT
</div>
</div>
</body>
|