From: Nicolas Morey-Chaisemartin Date: Tue, 22 Mar 2011 08:56:18 GMT Subject: [PATCH 2/2] Documentation/git-submodule.txt: Document the new 'U' prefix of git submodule status on submodules with merge conflicts Message-ID: <4D886432.6060007@kalray.eu> In-Reply-To: <51d033dc2978d62164dcb76b679bb7ebd9bc1802.1300784018.git.nmorey@kalray.eu> Signed-off-by: Nicolas Morey-Chaisemartin --- 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 3a5aa01..1a16ff6 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. -- 1.7.4