diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-04-05 00:21:10 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-04-05 00:21:10 +0000 |
| commit | 5cd1518ba777d6d41a66941c1af682009f26138a (patch) | |
| tree | e4fd00535b26048036a5e57b81558169b10b4b18 /git-submodule.txt | |
| parent | a47bf3c145d71ffd27b5fa0bb05493765225d757 (diff) | |
| download | git-htmldocs-5cd1518ba777d6d41a66941c1af682009f26138a.tar.gz | |
Autogenerated HTML docs for v1.7.5-rc0-131-gfa38c
Diffstat (limited to 'git-submodule.txt')
| -rw-r--r-- | git-submodule.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-submodule.txt b/git-submodule.txt index 3a5aa0143..1a16ff604 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -101,9 +101,10 @@ status:: currently checked out commit for each submodule, along with the submodule path and the output of 'git describe' for the SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not - initialized and `+` if the currently checked out submodule commit + initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing - repository. This command is the default command for 'git submodule'. + 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. |