summaryrefslogtreecommitdiffstats
path: root/git-submodule.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-04 16:16:51 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-04 16:16:51 -0700
commitf335393cb267ed983d1b9d6574b95d6f26bd5a85 (patch)
tree1c8feab891c51ceff96424dbd71474ce8efd65ec /git-submodule.html
parent53850261bf66576e51d8d6b0cee14b692de737e4 (diff)
downloadgit-htmldocs-f335393cb267ed983d1b9d6574b95d6f26bd5a85.tar.gz
Autogenerated HTML docs for v1.7.12-176-g3fc0e
Diffstat (limited to 'git-submodule.html')
-rw-r--r--git-submodule.html10
1 files changed, 8 insertions, 2 deletions
diff --git a/git-submodule.html b/git-submodule.html
index fdd71731b..888ce7761 100644
--- a/git-submodule.html
+++ b/git-submodule.html
@@ -733,6 +733,10 @@ setting as stored in .gitmodules, you can automatically initialize the
submodule with the <tt>--init</tt> option.</p></div>
<div class="paragraph"><p>If <tt>--recursive</tt> is specified, this command will recurse into the
registered submodules, and update any nested submodules within.</p></div>
+<div class="paragraph"><p>If <tt>--force</tt> is specified, the submodule will be checked out (using
+<tt>git checkout --force</tt> if appropriate), even if the commit specified in the
+index of the containing repository already matches the commit checked out in
+the submodule.</p></div>
</dd>
<dt class="hdlist1">
summary
@@ -829,7 +833,9 @@ sync
This option is only valid for add and update commands.
When running add, allow adding an otherwise ignored submodule path.
When running update, throw away local changes in submodules when
- switching to a different commit.
+ switching to a different commit; and always run a checkout operation
+ in the submodule, even if the commit listed in the index of the
+ containing repository matches the commit checked out in the submodule.
</p>
</dd>
<dt class="hdlist1">
@@ -969,7 +975,7 @@ for details.</p></div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-06-22 15:42:03 PDT
+Last updated 2012-09-04 16:16:22 PDT
</div>
</div>
</body>