diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-04 03:41:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-04 03:41:24 -0700 |
| commit | 1eb71bc0ec609c67b8a308f9267691144a48bffd (patch) | |
| tree | 85e1c1054de559a38f2f620fcdf103ccf8f2467d /Documentation/git-submodule.txt | |
| parent | 44bc573436c98b7c6cd798af04c538f6e76f0f6e (diff) | |
| parent | 313ee0d69f58c2bf2f4e0a62b812c9d08a39b240 (diff) | |
| download | git-1eb71bc0ec609c67b8a308f9267691144a48bffd.tar.gz | |
Merge branch 'nm/maint-conflicted-submodule-entries'
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once
Diffstat (limited to 'Documentation/git-submodule.txt')
| -rw-r--r-- | Documentation/git-submodule.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 3a5aa01435..1a16ff6044 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/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. |