diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-06 17:41:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-06 17:41:17 (GMT) |
| commit | 0c41f33c19c2f40015e31211557e818b000f9a25 (patch) | |
| tree | 082c327638afe97d14a8417603034537392f4d8d /Documentation | |
| parent | df0a6aeb35be7855fc96417cd01dce3e8e5146f5 (diff) | |
| parent | 313ee0d69f58c2bf2f4e0a62b812c9d08a39b240 (diff) | |
| download | git-0c41f33c19c2f40015e31211557e818b000f9a25.zip git-0c41f33c19c2f40015e31211557e818b000f9a25.tar.gz git-0c41f33c19c2f40015e31211557e818b000f9a25.tar.bz2 | |
Merge branch 'nm/maint-conflicted-submodule-entries' into maint
* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once
Diffstat (limited to 'Documentation')
| -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 1ed331c..e8ed2f2 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. |