summaryrefslogtreecommitdiffstats
path: root/git-submodule.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-22 15:42:39 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-22 15:42:39 -0700
commit7f2b3cb98f6fbfdd4680aa7d74f51f55e2174ef1 (patch)
tree819126657300af330e6ed6c5c78238226e5c2a2b /git-submodule.txt
parenta28a920b817789e9535e30d163d1cfeda9803b99 (diff)
downloadgit-htmldocs-7f2b3cb98f6fbfdd4680aa7d74f51f55e2174ef1.tar.gz
Autogenerated HTML docs for v1.7.11.1-29-gf71be
Diffstat (limited to 'git-submodule.txt')
-rw-r--r--git-submodule.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.txt b/git-submodule.txt
index 9e488c0aa..fbbbcb282 100644
--- a/git-submodule.txt
+++ b/git-submodule.txt
@@ -140,7 +140,7 @@ update::
checkout the commit specified in the index of the containing repository.
This will make the submodules HEAD be detached unless `--rebase` or
`--merge` is specified or the key `submodule.$name.update` is set to
- `rebase`, `merge` or `none`. `none` can be overriden by specifying
+ `rebase`, `merge` or `none`. `none` can be overridden by specifying
`--checkout`.
+
If the submodule is not yet initialized, and you just want to use the