X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-submodule.txt;h=1a16ff60448a72bebcba2daff7dbabc5feed8a4c;hb=65bc83d704b82b613f1f61b4ad97412376ab4a69;hp=3a5aa01435e5fa1b19cd666e6cb357c85fd4df90;hpb=54f6a8dbd65cbe6ad31a8b6b531de81009514eb3;p=git.git

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 3a5aa0143..1a16ff604 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.