Merge branch 'nm/maint-conflicted-submodule-entries'

* nm/maint-conflicted-submodule-entries:
submodule: process conflicting submodules only once

diff --combined Documentation/git-submodule.txt
index 3a5aa01435e5fa1b19cd666e6cb357c85fd4df90,e8ed2f2c0f440455443521d35989be7d7ff53c10..1a16ff60448a72bebcba2daff7dbabc5feed8a4c
--- 1/Documentation/git-submodule.txt
--- 2/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@@ -101,9 -101,10 +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.
@@@ -257,6 -258,11 +258,6 @@@ This file should be formatted in the sa
  to each submodule url is "submodule.$name.url".  See linkgit:gitmodules[5]
  for details.
  
 -
 -AUTHOR
 -------
 -Written by Lars Hjemli <hjemli@gmail.com>
 -
  GIT
  ---
  Part of the linkgit:git[1] suite