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.html | |
| parent | a47bf3c145d71ffd27b5fa0bb05493765225d757 (diff) | |
| download | git-htmldocs-5cd1518ba777d6d41a66941c1af682009f26138a.tar.gz | |
Autogenerated HTML docs for v1.7.5-rc0-131-gfa38c
Diffstat (limited to 'git-submodule.html')
| -rw-r--r-- | git-submodule.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-submodule.html b/git-submodule.html index 200895855..47b34daf9 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -510,9 +510,10 @@ status currently checked out commit for each submodule, along with the
submodule path and the output of <em>git describe</em> for the
SHA-1. Each SHA-1 will be prefixed with <tt>-</tt> if the submodule is not
- initialized and <tt>+</tt> if the currently checked out submodule commit
+ initialized, <tt>+</tt> 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 <em>git submodule</em>.
+ repository and <tt>U</tt> if the submodule has merge conflicts.
+ This command is the default command for <em>git submodule</em>.
</p>
<div class="paragraph"><p>If <em>--recursive</em> is specified, this command will recurse into nested
submodules, and show their status as well.</p></div>
@@ -767,7 +768,7 @@ for details.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-04-05 00:20:31 UTC
</div>
</div>
</body>
|