summaryrefslogtreecommitdiffstats
path: root/git-submodule.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-05-03 00:48:43 +0000
committerJunio C Hamano <junio@kernel.org>2011-05-03 00:48:43 +0000
commit600334628294fbcd6406b55a9a17d270371cb7e5 (patch)
treec5ab15140d948219ee4b005942e7c8f53970ee11 /git-submodule.txt
parent4f01892b5d07b7d152b572ed4686b55c02a5d41f (diff)
downloadgit-htmldocs-600334628294fbcd6406b55a9a17d270371cb7e5.tar.gz
Autogenerated HTML docs for v1.7.5-185-g0b9dee
Diffstat (limited to 'git-submodule.txt')
-rw-r--r--git-submodule.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-submodule.txt b/git-submodule.txt
index 1a16ff604..5e7a4130e 100644
--- a/git-submodule.txt
+++ b/git-submodule.txt
@@ -186,8 +186,10 @@ OPTIONS
-f::
--force::
- This option is only valid for the add command.
- Allow adding an otherwise ignored submodule path.
+ 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.
--cached::
This option is only valid for status and summary commands. These