aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-02 13:42:32 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-02 13:42:32 -0700
commite2c7a5b646bb9a4f126577346697d79b3143d30b (patch)
tree9cde48edade6f47bebff07e41e4f02c045c35879 /Documentation
parent0a65df58a0d5b17a72edd4e6247be29ab8af2b09 (diff)
parentaf9c9f97137dfb3f20a17d76520803c0312fd3e4 (diff)
downloadgit-e2c7a5b646bb9a4f126577346697d79b3143d30b.tar.gz
git-e2c7a5b646bb9a4f126577346697d79b3143d30b.tar.xz
Merge branch 'rr/maint-submodule-unknown-cmd' into maint
"git submodule frotz" was not diagnosed as "frotz" being an unknown subcommand to "git submodule"; the user instead got a complaint that "git submodule status" was run with an unknown path "frotz". * rr/maint-submodule-unknown-cmd: submodule: if $command was not matched, don't parse other args
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-submodule.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 2de7bf090..b4683bba1 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -112,7 +112,6 @@ status::
initialized, `+` if the currently checked out submodule commit
does not match the SHA-1 found in the index of the containing
repository and `U` if the submodule has merge conflicts.
- This command is the default command for 'git submodule'.
+
If `--recursive` is specified, this command will recurse into nested
submodules, and show their status as well.